Merge "Preserve legacy permission check behavior." into sc-dev