Merge "Don't leak flattened buffers from cached sets." into sc-dev