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