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