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