Merge "Public volumes belong to a single user." into nyc-dev