Issue #3509697: Make tests pass on 8.x-3.x

Merge request reports

Loading