Extends core work done in https://github.com/patternfly/patternfly/pull/4765
Extends core work done in patternfly/patternfly#4765