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