Issue #3505743: Fix for 'TypeError: Argument #2 ($route_match) must be of type RouteMatchInterface'.