Merge branch 'tb/geometric-repack'