Merge "Support RHEL 9"