Merge "Multi-region service endpoint support"