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