ACTIV-57 - Changes for per user entitlements