Merge branch 'redhat'