Merge "Generate more descriptive delete confirmation message." into nyc-dev