Issue #3575477: Fix test failures.

Closes #3575477

Merge request reports

Loading