CFY-645 fixed merge of last commit