CFY-642 dependencies from branches