Merge "Set entitlement status refresh days as 7" into 24D1-dev