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