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