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