rebase v6 branch

**Describe the enhancement or change**
A clear and concise description of the request. What is the expected outcome?

**Is this request originating from a Red Hat product team? If so, which ones and is there any sort of deadline for this enhancement?**

**Any other information?**
