Feature/cfy 643 node state changes