Merge "Handle shared user ID in upsert." into rvc-dev