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