Merge "Adding some new multi-endpoint stuff." into nyc-dev