GEOT-4576
Merge pull request #276 from dromagnoli/GEOT-4576

GEOT-4576