issue #22155: Fixes so tests will pass again.
Merge branch 'wip' into wip_old_router