diff --git a/packages/react-core/src/components/BackToTop/BackToTop.tsx b/packages/react-core/src/components/BackToTop/BackToTop.tsx
index 1cb41b5f31e..d47c2899d98 100644
--- a/packages/react-core/src/components/BackToTop/BackToTop.tsx
+++ b/packages/react-core/src/components/BackToTop/BackToTop.tsx
@@ -10,7 +10,7 @@ interface BackToTopProps extends React.DetailedHTMLProps<React.HTMLProps<HTMLDiv
   className?: string;
   /** Title to appear in back to top button. */
   title?: string;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Selector for the scrollable element to spy on. Not passing a selector defaults to spying on window scroll events. */
   scrollableSelector?: string;
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 9a1e5099797..30b49a00003 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -80,7 +80,7 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   tabIndex?: number;
   /** Adds danger styling to secondary or link button variants */
   isDanger?: boolean;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Adds count number to button */
   countOptions?: BadgeCountObject;
diff --git a/packages/react-core/src/components/Menu/MenuGroup.tsx b/packages/react-core/src/components/Menu/MenuGroup.tsx
index 3cbd0f17adc..689891a8211 100644
--- a/packages/react-core/src/components/Menu/MenuGroup.tsx
+++ b/packages/react-core/src/components/Menu/MenuGroup.tsx
@@ -11,7 +11,7 @@ export interface MenuGroupProps extends Omit<React.HTMLProps<HTMLElement>, 'labe
   label?: React.ReactNode;
   /** ID for title label */
   titleId?: string;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Group label heading level. Default is h1. */
   labelHeadingLevel?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
diff --git a/packages/react-core/src/components/Menu/MenuInput.tsx b/packages/react-core/src/components/Menu/MenuInput.tsx
index 0ba088ac388..8068dbde721 100644
--- a/packages/react-core/src/components/Menu/MenuInput.tsx
+++ b/packages/react-core/src/components/Menu/MenuInput.tsx
@@ -5,7 +5,7 @@ import { css } from '@patternfly/react-styles';
 export interface MenuInputProps extends React.HTMLProps<HTMLElement> {
   /** Items within input */
   children?: React.ReactNode;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
 }
 
diff --git a/packages/react-core/src/components/Menu/MenuItemAction.tsx b/packages/react-core/src/components/Menu/MenuItemAction.tsx
index 037366c899d..339a109f6e8 100644
--- a/packages/react-core/src/components/Menu/MenuItemAction.tsx
+++ b/packages/react-core/src/components/Menu/MenuItemAction.tsx
@@ -19,7 +19,7 @@ export interface MenuItemActionProps extends Omit<React.HTMLProps<HTMLButtonElem
   isDisabled?: boolean;
   /** Identifies the action item in the onActionClick on the Menu */
   actionId?: any;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
 }
 
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index c61700a37a1..2c83af0505b 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -41,7 +41,7 @@ export interface MenuToggleProps
   icon?: React.ReactNode;
   /** Optional badge rendered inside the toggle, after the children content */
   badge?: BadgeProps | React.ReactNode;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<MenuToggleElement>;
 }
 
diff --git a/packages/react-core/src/components/Select/SelectMenu.tsx b/packages/react-core/src/components/Select/SelectMenu.tsx
index 678be2a0f52..bbdd822f8ae 100644
--- a/packages/react-core/src/components/Select/SelectMenu.tsx
+++ b/packages/react-core/src/components/Select/SelectMenu.tsx
@@ -40,6 +40,7 @@ export interface SelectMenuProps extends Omit<React.HTMLProps<HTMLElement>, 'che
   keyHandler?: (index: number, innerIndex: number, position: string) => void;
   /** Flag indicating select has an inline text input for filtering */
   hasInlineFilter?: boolean;
+  /** @hide forwarded ref */
   innerRef?: any;
   /** Content rendered in the footer of the select menu */
   footer?: React.ReactNode;
diff --git a/packages/react-core/src/components/Tabs/Tab.tsx b/packages/react-core/src/components/Tabs/Tab.tsx
index 5867704a163..f8fe0adf095 100644
--- a/packages/react-core/src/components/Tabs/Tab.tsx
+++ b/packages/react-core/src/components/Tabs/Tab.tsx
@@ -33,7 +33,7 @@ export interface TabProps
   isAriaDisabled?: boolean;
   /** Events to prevent when the button is in an aria-disabled state */
   inoperableEvents?: string[];
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Optional Tooltip rendered to a Tab. Should be <Tooltip> with appropriate props for proper rendering. */
   tooltip?: React.ReactElement<any>;
diff --git a/packages/react-core/src/components/Tabs/TabContent.tsx b/packages/react-core/src/components/Tabs/TabContent.tsx
index 3e3109edfd3..3413cf76d0f 100644
--- a/packages/react-core/src/components/Tabs/TabContent.tsx
+++ b/packages/react-core/src/components/Tabs/TabContent.tsx
@@ -15,7 +15,7 @@ export interface TabContentProps extends Omit<React.HTMLProps<HTMLElement>, 'ref
   activeKey?: number | string;
   /** uniquely identifies the controlling Tab if used outside Tabs component */
   eventKey?: number | string;
-  /** Callback for the section ref */
+  /** @hide Callback for the section ref */
   innerRef?: React.Ref<any>;
   /** id passed from parent to identify the content section */
   id: string;
diff --git a/packages/react-core/src/components/TextArea/TextArea.tsx b/packages/react-core/src/components/TextArea/TextArea.tsx
index 6c76b479864..760e23bcd47 100644
--- a/packages/react-core/src/components/TextArea/TextArea.tsx
+++ b/packages/react-core/src/components/TextArea/TextArea.tsx
@@ -44,7 +44,7 @@ export interface TextAreaProps extends Omit<HTMLProps<HTMLTextAreaElement>, 'onC
   resizeOrientation?: 'horizontal' | 'vertical' | 'both';
   /** Custom flag to show that the text area requires an associated id or aria-label. */
   'aria-label'?: string;
-  /** A reference object to attach to the text area. */
+  /** @hide A reference object to attach to the text area. */
   innerRef?: React.RefObject<any>;
 }
 
diff --git a/packages/react-core/src/components/TextInput/TextInput.tsx b/packages/react-core/src/components/TextInput/TextInput.tsx
index 1d81781ba4e..b018adec1e9 100644
--- a/packages/react-core/src/components/TextInput/TextInput.tsx
+++ b/packages/react-core/src/components/TextInput/TextInput.tsx
@@ -61,7 +61,7 @@ export interface TextInputProps
   value?: string | number;
   /** Aria-label. The text input requires an associated id or aria-label. */
   'aria-label'?: string;
-  /** A reference object to attach to the text input box. */
+  /** @hide A reference object to attach to the text input box. */
   innerRef?: React.RefObject<any>;
   /** Trim text on left */
   isLeftTruncated?: boolean;
diff --git a/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx b/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx
index 6a8873eac35..ddda256b45d 100644
--- a/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx
+++ b/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx
@@ -37,13 +37,13 @@ export interface TextInputGroupMainProps extends Omit<React.HTMLProps<HTMLDivEle
   value?: string | number;
   /** Placeholder value for the input */
   placeholder?: string;
-  /** A reference object to attach to the input box */
+  /** @hide A reference object to attach to the input box */
   innerRef?: React.RefObject<any>;
   /** Name for the input */
   name?: string;
 }
 
-export const TextInputGroupMain: React.FunctionComponent<TextInputGroupMainProps> = ({
+const TextInputGroupMainBase: React.FunctionComponent<TextInputGroupMainProps> = ({
   children,
   className,
   icon,
@@ -99,4 +99,10 @@ export const TextInputGroupMain: React.FunctionComponent<TextInputGroupMainProps
   );
 };
 
+export const TextInputGroupMain = React.forwardRef(
+  (props: TextInputGroupMainProps, ref: React.Ref<HTMLInputElement>) => (
+    <TextInputGroupMainBase innerRef={ref as React.MutableRefObject<any>} {...props} />
+  )
+);
+
 TextInputGroupMain.displayName = 'TextInputGroupMain';
diff --git a/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx b/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
index cb501b11f55..7d4c7e7ccd5 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
@@ -49,7 +49,7 @@ export interface ToolbarGroupProps extends Omit<React.HTMLProps<HTMLDivElement>,
   };
   /** Content to be rendered inside the data toolbar group */
   children?: React.ReactNode;
-  /** Reference to pass to this group if it has .pf-m-chip-container modifier */
+  /** @hide Reference to pass to this group if it has .pf-m-chip-container modifier */
   innerRef?: React.RefObject<any>;
 }
 
diff --git a/packages/react-table/src/components/TableComposable/TableComposable.tsx b/packages/react-table/src/components/TableComposable/TableComposable.tsx
index 46082127351..e0b01c571e2 100644
--- a/packages/react-table/src/components/TableComposable/TableComposable.tsx
+++ b/packages/react-table/src/components/TableComposable/TableComposable.tsx
@@ -23,7 +23,7 @@ export interface BaseCellProps {
   width?: 10 | 15 | 20 | 25 | 30 | 35 | 40 | 45 | 50 | 60 | 70 | 80 | 90 | 100;
   /** Visibility breakpoint modifiers */
   visibility?: (keyof IVisibility)[];
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
 }
 
@@ -47,7 +47,7 @@ export interface TableComposableProps extends React.HTMLProps<HTMLTableElement>,
   role?: string;
   /** If set to true, the table header sticks to the top of its container */
   isStickyHeader?: boolean;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.RefObject<any>;
   /** Flag indicating table is a tree table */
   isTreeTable?: boolean;
diff --git a/packages/react-table/src/components/TableComposable/Tbody.tsx b/packages/react-table/src/components/TableComposable/Tbody.tsx
index 7a7618cc30a..e8cbf74acf3 100644
--- a/packages/react-table/src/components/TableComposable/Tbody.tsx
+++ b/packages/react-table/src/components/TableComposable/Tbody.tsx
@@ -9,7 +9,7 @@ export interface TbodyProps extends React.HTMLProps<HTMLTableSectionElement> {
   className?: string;
   /** Modifies the body to allow for expandable rows */
   isExpanded?: boolean;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Flag indicating the <tbody> contains oddly striped rows. */
   isOddStriped?: boolean;
diff --git a/packages/react-table/src/components/TableComposable/Thead.tsx b/packages/react-table/src/components/TableComposable/Thead.tsx
index 7ccd27dce83..4bd37b31264 100644
--- a/packages/react-table/src/components/TableComposable/Thead.tsx
+++ b/packages/react-table/src/components/TableComposable/Thead.tsx
@@ -9,7 +9,7 @@ export interface TheadProps extends React.HTMLProps<HTMLTableSectionElement> {
   className?: string;
   /** Won't wrap the table head if true */
   noWrap?: boolean;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Indicates the <thead> contains a nested header */
   hasNestedHeader?: boolean;
diff --git a/packages/react-table/src/components/TableComposable/Tr.tsx b/packages/react-table/src/components/TableComposable/Tr.tsx
index 865ae84e644..d96d20bde5e 100644
--- a/packages/react-table/src/components/TableComposable/Tr.tsx
+++ b/packages/react-table/src/components/TableComposable/Tr.tsx
@@ -10,7 +10,7 @@ export interface TrProps extends React.HTMLProps<HTMLTableRowElement>, OUIAProps
   children?: React.ReactNode;
   /** Additional classes added to the <tr> row  */
   className?: string;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Flag indicating the Tr is hidden */
   isHidden?: boolean;