CFY-1046 continue work