Merge "Only try to add details to zip once." into nyc-dev