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