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