Add GR logic to team_member

Tweak GR logic for person