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