CFY-1808 added comment