Fix100

Merged Matias requested to merge fix100 into 12.0-stage

Merge request reports