#3565396: Fix test failures.

Closes #3565396

Merge request reports

Loading