Move check-in of nodes to finally block to avoid stale checked-in nodes (see bug 43163)
Changed paths: