Issue #3575480: Fix test failures.

Closes #3575480

Merge request reports

Loading