CFY-1185 added comment