Merge "Avoid key conflict errors in User::addToDatabase"