[GEOT-4916]: Backport to 11.x