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