For ENG-5472, based on Ning's feedback update other place that might see nodes go missing