Merge "Remove fatal assert from CachedSet::render" into sc-dev