Feature/cfy 759 repo optimizations