Revisit timing to capture old/new nodes (#56877)

Revisit timing to capture old/new nodes (#56877) #10095