Merge "Consistent creation/destruction of user data." into nyc-dev