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