CFY-637 update versions and branches