Feature/cfy 961 fix version