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