Issue #3568698: Fix the test failures for the 2.x branch.

Closes #3568698

Merge request reports

Loading