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