Feature/cfy 643 changes to node state