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