Merge "Extract method for enforcing privileged routing permissions" into main