Merge branch 'move-expansion-radii' into interpolation-mapper