Optimisation, convert to geometry object only when requested
Merge remote-tracking branch 'nicolas-f/optimize-geometry' into h2-fork