Merge "Finalize multiendpoint functionality." into nyc-mr1-dev