Node shall wander no more
Merge pull request #4404 from openscholar/wandering-nodes

Node shall wander no more