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