Merge "Quiet intent resolver" into nyc-dev