ENG-4682: Refine node state tracking/reporting