12.0 stage

Merged Pablo Ferreira requested to merge 12.0-stage into 12.0

Merge request reports