Merge "Fix RoutingSessionInfo route ID issue" into rvc-dev