Update 10.0 production with latest changes

Merged Santiago Said requested to merge 10.0-stage into 10.0

Merge request reports