merge current main to new_areas...

Gui, Xiaoyunrequested to merge
new_areas_currentMain into new_areas

... in order to resolve merge conflicts

Merge request reports