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