followup modifications

Merged Luciano Ortiz requested to merge 15.0-tommasi-stage-T5658 into 15.0-tommasi-stage

Merge request reports