Merge "Non-functional refactoring of RoutingSessionInfo" into main