Merge "Cache permission policy" into sc-dev