Merge "Fix inability to add all tiles." into nyc-dev