Merge pull request #1498 from laurentg/geometry-optimizations

Geometry optimizations
Merge branch 'master' into VCub+GraphO+RT