Merge "Package restrictions per user"