RHEL branch and other various changes