Revert "Revert "Merge branch '12.0-sprint6' into '12.0'""

Merged Luciano Ortiz requested to merge 12.0-sprint6 into 12.0

This reverts commit a5bd97bf

Merge request reports