CFY-1746 fix review comments