Merge "Implement new ephemeral resolver design" into nyc-mr1-dev