8.x pull request for GEOT-4392

GEOT-4392, fixing property collectors