CFY-516 commit before centos integration