[dali_1.2.27] Merge branch 'devel/master'