Merge branch 'jk/repack-leakfix'

Leakfix. * jk/repack-leakfix: repack: free geometry struct