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