Merge branch 'master' into move-expansion-radii