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