- GEOS-6275 GEOS-6276 Back Port from 2.5.x