Merge "Split off tracking of node presence"