Merge "Continued multi-endpoint work." into nyc-mr1-dev