fix

Merged Luciano Ortiz requested to merge 12.0-sprint6-fix into 12.0-sprint6

Merge request reports