task: #3620883 Make tests pass on 6.3.x

Closes #3620883

Merge request reports

Loading