Feature/cfy 582 puppet