CFY-748 improve rest api