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