Merge "Update user support for package manager"