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