Merge "Add output dataspace to CachedSet rendering" into sc-dev