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