Issue #3559318: Port to 11.2.x.

Closes #3559318

Merge request reports

Loading