Merge "Refactor the EntitlementManager"