Merge "Add API support for multi-endpoint." into nyc-dev