12.0 t6623

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

Merge request reports