[dali_2.0.35] Merge branch 'devel/master'