Follow up to core issue https://github.com/patternfly/patternfly/issues/5732 ```[tasklist] ### Tasks - [ ] https://github.com/patternfly/patternfly-react/issues/9861 - [ ] https://github.com/patternfly/patternfly-react/issues/9862 ```