Feature/cfy 596 standalone puppet