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