Merge "Apply additional CachedSet rendering fixes" into sc-dev