Merge "New API w/ multiple prefixes" into nyc-mr1-dev