Revert "Merge branch '7.0-stage' into '7.0-ProductReplacement'"

Merged Santiago Said requested to merge 7.0-stage into 7.0

This reverts commit eea90b50

Merge request reports