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