CFY-1185 fix review comments