[dali_2.0.27] Merge branch 'devel/master'