Merge "Create root directory for supplemental data during user creation"