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