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