Merge "Fix EntitlementManager issues" into rvc-dev