Update heap, polygon, geometry from develop.