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