resync additions from rhel_centos7 branch.