Merge "Simplify remote routing session logic and remove duplication" into main