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