CFY-1196 fix import due to cli changes