Merge "Fix and optimize stripForDelivery" into nyc-dev