8.0 downgrade from 11.0

Merged Julián Corso requested to merge 8.0-downgrade-from-11.0 into 8.0-stage

Merge request reports