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