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