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