Ported GEOM to upstream version 730