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