Merge "Correcting a deadlock in CreateRelatedUser"