Issue #3582448 - port of patch #1 to MR.

Closes #3582448

Merge request reports

Loading