GEOT-4576

GEOT-4576 patch