*8095* backport Role refactor to Harvester