Merge "Changes Message from using parcels to bundles" into nyc-dev