Merge "Whitelist packages for user types"