CFY-1318 review comments