T6989 t6985

Merged diego.barreto requested to merge T6989-T6985 into 12.0

Merge request reports