CFY-1318 restore