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