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