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