Merge "Adding multiuser support to the shelf."