Merge "Build both filename views before deleting." into nyc-mr1-dev