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