Merge "fix resolver" into nyc-mr1-dev