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