Merge "replace UserManagerInternal with UserManager"