Merge "Use UserManagerInternal when possible in IMMS"