Merge "Remove duplicate code for route updates" into main