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