Merge "Fix use of invalid iterator." into nyc-dev