Merge "Delete only the target user" into nyc-dev