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