Fix bootstrapping problem with UserProfile.
Merge branch 'byrman_fix-bootstrapping-problem'