Merge "Fix EntitlementManager issues"