12.0 t6486

Merged diego.barreto requested to merge 12.0-T6486 into 12.0

Merge request reports