[dali_1.4.33] Merge branch 'devel/master'