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