[GEOT-4916]: Backport to 11.x
Merge pull request #565 from dromagnoli/GEOT-4916-11.x

[GEOT-4916]: Backport to 11.x