[RHCLOUD-35261](https://issues.redhat.com/browse/RHCLOUD-35261) Pull the new changes from v5 into the main branch