[ADD] changes in prod

Merged Ignacio Goitea requested to merge 7.0-ADD-prod-changes into 7.0-stage

Merge request reports