CFY-1229 fixed bad merge commit