Merge branch 'move-expansion-radii' into geometry-collection-caching