CFY-637 use tagged branch