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