ENG-4744, ENG-4096: do NOT re-use reAggNode for multiple plans; solve conflicts between these two tickets.