Merge "Refactor the EntitlementManager" into rvc-dev