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