Merge "Add a stricter check for resetting all cached sets." into sc-dev