CFY-1377 more porting