Refactored rhel7 branch