Merge "[Ravenwood] Cleaner sharding" into main