Merge "Extract and simplify RoutingController book-keeping operations" into main