Merge "RedHat support"