More work done on centos7 branch