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