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