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