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