[GEOS-10924]