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