Merge with master to pick up red hat version name update