Merge "Revert "Add forwarding methods to RoutingCoordinator"" into main