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