Merge "Disregard isCredential for routing to proxy service" into main