[dali_2.0.14] Merge branch 'devel/master'