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