non-blocking user profile manager
version keys for user profile enabled
small reorganization
Merge remote-tracking branch 'origin/userprofilemanager_non_blocking'