GEOT-4857 Backport to 11.x
Merge pull request #522 from geosolutions-it/GEOT-4857-11.x-bkp

GEOT-4857 Backport to 11.x