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