Merge "BQ: Fix iterator use" into nyc-dev