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