diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
index 5c34c7d5d5c..e0540d54dfb 100644
--- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
+++ b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
@@ -61,6 +61,8 @@ export interface ApplicationLauncherProps
   favoritesLabel?: string;
   /** ID of toggle */
   toggleId?: string;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export class ApplicationLauncher extends React.Component<ApplicationLauncherProps> {
@@ -83,7 +85,8 @@ export class ApplicationLauncher extends React.Component<ApplicationLauncherProp
     searchPlaceholderText: 'Filter by name...',
     searchNoResultsText: 'No results found',
     favoritesLabel: 'Favorites',
-    menuAppendTo: 'inline'
+    menuAppendTo: 'inline',
+    removeFindDomNode: false
   };
 
   createSearchBox = () => {
@@ -129,6 +132,7 @@ export class ApplicationLauncher extends React.Component<ApplicationLauncherProp
       favoritesLabel,
       searchNoResultsText,
       menuAppendTo,
+      removeFindDomNode,
       ...props
     } = this.props;
     let renderableItems: React.ReactNode[] = [];
@@ -189,6 +193,7 @@ export class ApplicationLauncher extends React.Component<ApplicationLauncherProp
             className={className}
             aria-label={ariaLabel}
             menuAppendTo={menuAppendTo}
+            removeFindDomNode={removeFindDomNode}
             toggle={
               <DropdownToggle
                 id={toggleId}
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx b/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
index 49eac289b72..e8ae476019e 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
+++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
@@ -55,8 +55,17 @@ describe('ApplicationLauncher', () => {
 
   test('custom icon', () => {
     const { asFragment } = render(
-      <ApplicationLauncher items={dropdownItems} isOpen toggleIcon={<HelpIcon id="test-icon" />} />
+      <React.StrictMode>
+        <ApplicationLauncher items={dropdownItems} isOpen toggleIcon={<HelpIcon id="test-icon" />} />
+      </React.StrictMode>
     );
     expect(asFragment()).toMatchSnapshot();
   });
+
+  test('Renders in strict mode', () => {
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = render(<ApplicationLauncher removeFindDomNode isOpen items={dropdownItems} />);
+    expect(consoleError).not.toHaveBeenCalled();
+    expect(asFragment()).toMatchSnapshot();
+  });
 });
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
index eaee472026a..478ec5517a2 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
+++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
@@ -1,5 +1,151 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`ApplicationLauncher Renders in strict mode 1`] = `
+<DocumentFragment>
+  <nav
+    aria-label="Application launcher"
+    class="pf-c-app-launcher pf-m-expanded"
+    data-ouia-component-type="PF4/ApplicationLauncher"
+    data-ouia-safe="true"
+  >
+    <button
+      aria-expanded="true"
+      aria-haspopup="true"
+      aria-label="Application launcher"
+      class="pf-c-app-launcher__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe="true"
+      id="pf-dropdown-toggle-id-7"
+      type="button"
+    >
+      <span>
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 512 512"
+          width="1em"
+        >
+          <path
+            d="M149.333 56v80c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V56c0-13.255 10.745-24 24-24h101.333c13.255 0 24 10.745 24 24zm181.334 240v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm32-240v80c0 13.255 10.745 24 24 24H488c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24zm-32 80V56c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm-205.334 56H24c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24zM0 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm386.667-56H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zm0 160H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zM181.333 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24z"
+          />
+        </svg>
+      </span>
+    </button>
+    <ul
+      aria-labelledby="pf-dropdown-toggle-id-7"
+      class="pf-c-app-launcher__menu"
+      role="menu"
+    >
+      <li
+        role="none"
+      >
+        <a
+          aria-disabled="false"
+          class="pf-c-app-launcher__menu-item"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-19"
+          data-ouia-component-type="PF4/DropdownItem"
+          data-ouia-safe="true"
+          role="menuitem"
+          tabindex="-1"
+        >
+          Link
+        </a>
+      </li>
+      <li
+        role="none"
+      >
+        <button
+          aria-disabled="false"
+          class="pf-c-app-launcher__menu-item"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-20"
+          data-ouia-component-type="PF4/DropdownItem"
+          data-ouia-safe="true"
+          role="menuitem"
+          tabindex="-1"
+          type="button"
+        >
+          Action
+        </button>
+      </li>
+      <li
+        role="none"
+      >
+        <a
+          aria-disabled="true"
+          class="pf-m-disabled pf-c-app-launcher__menu-item"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-21"
+          data-ouia-component-type="PF4/DropdownItem"
+          data-ouia-safe="true"
+          role="menuitem"
+          tabindex="-1"
+        >
+          Disabled Link
+        </a>
+      </li>
+      <li
+        role="none"
+      >
+        <button
+          aria-disabled="true"
+          class="pf-m-disabled pf-c-app-launcher__menu-item"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-22"
+          data-ouia-component-type="PF4/DropdownItem"
+          data-ouia-safe="true"
+          role="menuitem"
+          tabindex="-1"
+          type="button"
+        >
+          Disabled Action
+        </button>
+      </li>
+      <li
+        role="none"
+      >
+        <div
+          class="pf-c-divider"
+          role="separator"
+        />
+      </li>
+      <li
+        role="none"
+      >
+        <a
+          aria-disabled="false"
+          class="pf-c-app-launcher__menu-item"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-23"
+          data-ouia-component-type="PF4/DropdownItem"
+          data-ouia-safe="true"
+          role="menuitem"
+          tabindex="-1"
+        >
+          Separated Link
+        </a>
+      </li>
+      <li
+        role="none"
+      >
+        <button
+          aria-disabled="false"
+          class="pf-c-app-launcher__menu-item"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-24"
+          data-ouia-component-type="PF4/DropdownItem"
+          data-ouia-safe="true"
+          role="menuitem"
+          tabindex="-1"
+          type="button"
+        >
+          Separated Action
+        </button>
+      </li>
+    </ul>
+  </nav>
+</DocumentFragment>
+`;
+
 exports[`ApplicationLauncher custom icon 1`] = `
 <DocumentFragment>
   <nav
@@ -13,7 +159,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
       aria-haspopup="true"
       aria-label="Application launcher"
       class="pf-c-app-launcher__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="pf-dropdown-toggle-id-5"
@@ -47,7 +193,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <a
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-7"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-8"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -62,7 +208,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <button
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-10"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -78,7 +224,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <a
           aria-disabled="true"
           class="pf-m-disabled pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-9"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-12"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -93,7 +239,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <button
           aria-disabled="true"
           class="pf-m-disabled pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-14"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -117,7 +263,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <a
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-11"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-16"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -132,7 +278,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <button
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-18"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
diff --git a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
index a7ea188509b..d1779e58370 100644
--- a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
+++ b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
@@ -66,6 +66,8 @@ export interface ContextSelectorProps extends Omit<ToggleMenuBaseProps, 'menuApp
   isFlipEnabled?: boolean;
   /** Id of the context selector */
   id?: string;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export class ContextSelector extends React.Component<ContextSelectorProps, { ouiaStateId: string }> {
@@ -89,7 +91,8 @@ export class ContextSelector extends React.Component<ContextSelectorProps, { oui
     footer: null as React.ReactNode,
     isPlain: false,
     isText: false,
-    isFlipEnabled: false
+    isFlipEnabled: false,
+    removeFindDomNode: false
   };
   constructor(props: ContextSelectorProps) {
     super(props);
@@ -131,6 +134,7 @@ export class ContextSelector extends React.Component<ContextSelectorProps, { oui
       disableFocusTrap,
       isFlipEnabled,
       id,
+      removeFindDomNode,
       ...props
     } = this.props;
 
@@ -231,6 +235,7 @@ export class ContextSelector extends React.Component<ContextSelectorProps, { oui
         popper={popperContainer}
         appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
         isVisible={isOpen}
+        removeFindDomNode={removeFindDomNode}
       />
     );
   }
diff --git a/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx b/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx
index 79971100815..50b1a58f065 100644
--- a/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx
+++ b/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx
@@ -21,7 +21,24 @@ describe('ContextSelector', () => {
   });
 
   test('Renders ContextSelector open', () => {
-    const { asFragment } = render(<ContextSelector isOpen id="render-open">{items}</ContextSelector>);
+    const { asFragment } = render(
+      <ContextSelector isOpen id="render-open">
+        {items}
+      </ContextSelector>
+    );
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  test('Renders in strict mode', () => {
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = render(
+      <React.StrictMode>
+        <ContextSelector removeFindDomNode isOpen id="render">
+          {items}
+        </ContextSelector>
+      </React.StrictMode>
+    );
+    expect(consoleError).not.toHaveBeenCalled();
     expect(asFragment()).toMatchSnapshot();
   });
 
diff --git a/packages/react-core/src/components/ContextSelector/__tests__/__snapshots__/ContextSelector.test.tsx.snap b/packages/react-core/src/components/ContextSelector/__tests__/__snapshots__/ContextSelector.test.tsx.snap
index 8bc18141d47..37c450cc7f2 100644
--- a/packages/react-core/src/components/ContextSelector/__tests__/__snapshots__/ContextSelector.test.tsx.snap
+++ b/packages/react-core/src/components/ContextSelector/__tests__/__snapshots__/ContextSelector.test.tsx.snap
@@ -183,3 +183,147 @@ exports[`ContextSelector Renders ContextSelector open 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`ContextSelector Renders in strict mode 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-context-selector pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-ContextSelector-4"
+    data-ouia-component-type="PF4/ContextSelector"
+    data-ouia-safe="true"
+  >
+    <button
+      aria-expanded="true"
+      aria-labelledby="pf-context-selector-label-id-render pf-context-selector-toggle-id-render"
+      class="pf-c-context-selector__toggle"
+      id="pf-context-selector-toggle-id-render"
+      type="button"
+    >
+      <span
+        class="pf-c-context-selector__toggle-text"
+      />
+      <span
+        class="pf-c-context-selector__toggle-icon"
+      >
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 320 512"
+          width="1em"
+        >
+          <path
+            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+          />
+        </svg>
+      </span>
+    </button>
+    <div
+      class="pf-c-context-selector__menu"
+      id="render"
+    >
+      <div>
+        <div
+          class="pf-c-context-selector__menu-search"
+        >
+          <div
+            class="pf-c-input-group"
+          >
+            <input
+              aria-invalid="false"
+              aria-label="Search menu items"
+              class="pf-c-form-control"
+              data-ouia-component-id="OUIA-Generated-TextInputBase-3"
+              data-ouia-component-type="PF4/TextInput"
+              data-ouia-safe="true"
+              placeholder="Search"
+              type="search"
+              value=""
+            />
+            <button
+              aria-disabled="false"
+              aria-label="Search menu items"
+              class="pf-c-button pf-m-control"
+              data-ouia-component-id="OUIA-Generated-Button-control-3"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                style="vertical-align: -0.125em;"
+                viewBox="0 0 512 512"
+                width="1em"
+              >
+                <path
+                  d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <ul
+          class="pf-c-context-selector__menu-list"
+          role="menu"
+        >
+          <li
+            role="none"
+          >
+            <button
+              class="pf-c-context-selector__menu-list-item"
+              role="menuitem"
+            >
+              My Project
+            </button>
+          </li>
+          <li
+            role="none"
+          >
+            <button
+              class="pf-c-context-selector__menu-list-item"
+              role="menuitem"
+            >
+              OpenShift Cluster
+            </button>
+          </li>
+          <li
+            role="none"
+          >
+            <button
+              class="pf-c-context-selector__menu-list-item"
+              role="menuitem"
+            >
+              Production Ansible
+            </button>
+          </li>
+          <li
+            role="none"
+          >
+            <button
+              class="pf-c-context-selector__menu-list-item"
+              role="menuitem"
+            >
+              AWS
+            </button>
+          </li>
+          <li
+            role="none"
+          >
+            <button
+              class="pf-c-context-selector__menu-list-item"
+              role="menuitem"
+            >
+              Azure
+            </button>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/Dropdown/Dropdown.tsx b/packages/react-core/src/components/Dropdown/Dropdown.tsx
index a65d82c6cf5..aac27add10b 100644
--- a/packages/react-core/src/components/Dropdown/Dropdown.tsx
+++ b/packages/react-core/src/components/Dropdown/Dropdown.tsx
@@ -60,6 +60,8 @@ export interface DropdownProps
    * appended inline, e.g. `menuAppendTo="parent"`
    */
   isFlipEnabled?: boolean;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export const Dropdown: React.FunctionComponent<DropdownProps> = ({
@@ -72,6 +74,7 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
   contextProps,
   menuAppendTo = 'inline',
   isFlipEnabled = false,
+  removeFindDomNode = false,
   ...props
 }: DropdownProps) => (
   <DropdownContext.Provider
@@ -97,7 +100,12 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
       ...contextProps
     }}
   >
-    <DropdownWithContext menuAppendTo={menuAppendTo} isFlipEnabled={isFlipEnabled} {...props} />
+    <DropdownWithContext
+      menuAppendTo={menuAppendTo}
+      isFlipEnabled={isFlipEnabled}
+      removeFindDomNode={removeFindDomNode}
+      {...props}
+    />
   </DropdownContext.Provider>
 );
 Dropdown.displayName = 'Dropdown';
diff --git a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
index a0b77486e47..bca353d0c1f 100644
--- a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
@@ -77,6 +77,7 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
       autoFocus,
       menuAppendTo,
       isFlipEnabled,
+      removeFindDomNode,
       ...props
     } = this.props;
     const id = toggle.props.id || `pf-dropdown-toggle-id-${DropdownWithContext.currentId++}`;
@@ -174,6 +175,7 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
               position={position}
               appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
               isVisible={isOpen}
+              removeFindDomNode={removeFindDomNode}
             />
           );
         }}
diff --git a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
index 56631ceda87..0a26700b785 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
@@ -123,6 +123,22 @@ describe('Dropdown', () => {
     );
     expect(asFragment()).toMatchSnapshot();
   });
+
+  test('Renders in strict mode', () => {
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = render(
+      <React.StrictMode>
+        <Dropdown
+          isOpen
+          dropdownItems={dropdownItems}
+          toggle={<DropdownToggle id="Dropdown Toggle">Dropdown</DropdownToggle>}
+          removeFindDomNode
+        />
+      </React.StrictMode>
+    );
+    expect(consoleError).not.toHaveBeenCalled();
+    expect(asFragment()).toMatchSnapshot();
+  });
 });
 
 describe('KebabToggle', () => {
diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
index c6e47f3e6fe..ba14c21f220 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
@@ -1,5 +1,129 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Dropdown Renders in strict mode 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-dropdown pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-Dropdown-10"
+    data-ouia-component-type="PF4/Dropdown"
+    data-ouia-safe="true"
+  >
+    <button
+      aria-expanded="true"
+      aria-haspopup="true"
+      class="pf-c-dropdown__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-10"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe="true"
+      id="Dropdown Toggle"
+      type="button"
+    >
+      <span
+        class="pf-c-dropdown__toggle-text"
+      >
+        Dropdown
+      </span>
+      <span
+        class="pf-c-dropdown__toggle-icon"
+      >
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 320 512"
+          width="1em"
+        >
+          <path
+            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+          />
+        </svg>
+      </span>
+    </button>
+    <ul
+      aria-labelledby="Dropdown Toggle"
+      class="pf-c-dropdown__menu"
+      role="menu"
+    >
+      <li
+        role="none"
+      >
+        <a
+          class="pf-c-dropdown__menu-item"
+          role="none"
+        >
+          Link
+        </a>
+      </li>
+      <li
+        role="none"
+      >
+        <button
+          class="pf-c-dropdown__menu-item"
+          role="none"
+          type="button"
+        >
+          Action
+        </button>
+      </li>
+      <li
+        role="none"
+      >
+        <a
+          aria-disabled="true"
+          class="pf-m-disabled pf-c-dropdown__menu-item"
+          role="none"
+        >
+          Disabled Link
+        </a>
+      </li>
+      <li
+        role="none"
+      >
+        <button
+          aria-disabled="true"
+          class="pf-m-disabled pf-c-dropdown__menu-item"
+          role="none"
+          type="button"
+        >
+          Disabled Action
+        </button>
+      </li>
+      <li
+        role="none"
+      >
+        <div
+          class="pf-c-divider"
+          role="separator"
+        />
+      </li>
+      <li
+        role="none"
+      >
+        <a
+          class="pf-c-dropdown__menu-item"
+          role="none"
+        >
+          Separated Link
+        </a>
+      </li>
+      <li
+        role="none"
+      >
+        <button
+          class="pf-c-dropdown__menu-item"
+          role="none"
+          type="button"
+        >
+          Separated Action
+        </button>
+      </li>
+    </ul>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`Dropdown alignment breakpoints 1`] = `
 <DocumentFragment>
   <div
@@ -531,7 +655,7 @@ exports[`KebabToggle basic 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-dropdown pf-m-expanded"
-    data-ouia-component-id="OUIA-Generated-Dropdown-15"
+    data-ouia-component-id="OUIA-Generated-Dropdown-17"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
@@ -572,7 +696,7 @@ exports[`KebabToggle dropup + right aligned 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-dropdown pf-m-top pf-m-align-right"
-    data-ouia-component-id="OUIA-Generated-Dropdown-12"
+    data-ouia-component-id="OUIA-Generated-Dropdown-14"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
@@ -606,7 +730,7 @@ exports[`KebabToggle dropup 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-dropdown pf-m-top"
-    data-ouia-component-id="OUIA-Generated-Dropdown-11"
+    data-ouia-component-id="OUIA-Generated-Dropdown-13"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
@@ -641,7 +765,7 @@ exports[`KebabToggle expanded 1`] = `
   <div
     aria-label="Dropdown button"
     class="pf-c-dropdown pf-m-expanded"
-    data-ouia-component-id="OUIA-Generated-Dropdown-13"
+    data-ouia-component-id="OUIA-Generated-Dropdown-15"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
@@ -754,7 +878,7 @@ exports[`KebabToggle plain 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-dropdown"
-    data-ouia-component-id="OUIA-Generated-Dropdown-14"
+    data-ouia-component-id="OUIA-Generated-Dropdown-16"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
@@ -789,7 +913,7 @@ exports[`KebabToggle regular 1`] = `
   <div
     aria-label="Dropdown button"
     class="pf-c-dropdown"
-    data-ouia-component-id="OUIA-Generated-Dropdown-9"
+    data-ouia-component-id="OUIA-Generated-Dropdown-11"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
@@ -823,7 +947,7 @@ exports[`KebabToggle right aligned 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-dropdown pf-m-align-right"
-    data-ouia-component-id="OUIA-Generated-Dropdown-10"
+    data-ouia-component-id="OUIA-Generated-Dropdown-12"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe="true"
   >
diff --git a/packages/react-core/src/components/Nav/NavItem.tsx b/packages/react-core/src/components/Nav/NavItem.tsx
index 103b7517a2e..5ba2aebd975 100644
--- a/packages/react-core/src/components/Nav/NavItem.tsx
+++ b/packages/react-core/src/components/Nav/NavItem.tsx
@@ -32,6 +32,8 @@ export interface NavItemProps extends Omit<React.HTMLProps<HTMLAnchorElement>, '
   flyout?: React.ReactElement;
   /** Callback when flyout is opened or closed */
   onShowFlyout?: () => void;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export const NavItem: React.FunctionComponent<NavItemProps> = ({
@@ -49,6 +51,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
   onShowFlyout,
   ouiaId,
   ouiaSafe,
+  removeFindDomNode = false,
   ...props
 }: NavItemProps) => {
   const { flyoutRef, setFlyoutRef } = React.useContext(NavContext);
@@ -217,6 +220,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
       placement="right-start"
       isVisible={flyoutVisible}
       onDocumentKeyDown={handleFlyout}
+      removeFindDomNode={removeFindDomNode}
     />
   );
 
diff --git a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
index 1833524f23a..2c471ccfd54 100644
--- a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
@@ -41,6 +41,25 @@ describe('Nav', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
+  test('Renders nav list in strict mode', () => {
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = renderNav(
+      <React.StrictMode>
+        <Nav className="test-nav-class">
+          <NavList className="test-nav-list-class">
+            {props.items.map(item => (
+              <NavItem removeFindDomNode to={item.to} key={item.to} className="test-nav-item-class">
+                {item.label}
+              </NavItem>
+            ))}
+          </NavList>
+        </Nav>
+      </React.StrictMode>
+    );
+    expect(consoleError).not.toHaveBeenCalled();
+    expect(asFragment()).toMatchSnapshot();
+  });
+
   test('Dark Nav List', () => {
     const { asFragment } = renderNav(
       <Nav className="test=nav-class" theme="dark">
diff --git a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
index 8c75986cf41..869d7955e38 100644
--- a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
+++ b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`Nav Dark Nav List 1`] = `
   <nav
     aria-label="Global"
     class="pf-c-nav test=nav-class"
-    data-ouia-component-id="OUIA-Generated-Nav-2"
+    data-ouia-component-id="OUIA-Generated-Nav-4"
     data-ouia-component-type="PF4/Nav"
     data-ouia-safe="true"
   >
@@ -14,7 +14,7 @@ exports[`Nav Dark Nav List 1`] = `
     >
       <li
         class="pf-c-nav__item test-nav-item-class"
-        data-ouia-component-id="OUIA-Generated-NavItem-5"
+        data-ouia-component-id="OUIA-Generated-NavItem-13"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -27,7 +27,7 @@ exports[`Nav Dark Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item test-nav-item-class"
-        data-ouia-component-id="OUIA-Generated-NavItem-6"
+        data-ouia-component-id="OUIA-Generated-NavItem-14"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -40,7 +40,7 @@ exports[`Nav Dark Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item test-nav-item-class"
-        data-ouia-component-id="OUIA-Generated-NavItem-7"
+        data-ouia-component-id="OUIA-Generated-NavItem-15"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -53,7 +53,7 @@ exports[`Nav Dark Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item test-nav-item-class"
-        data-ouia-component-id="OUIA-Generated-NavItem-8"
+        data-ouia-component-id="OUIA-Generated-NavItem-16"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -74,7 +74,7 @@ exports[`Nav Default Nav List - Trigger item active update 1`] = `
   <nav
     aria-label="Global"
     class="pf-c-nav"
-    data-ouia-component-id="OUIA-Generated-Nav-3"
+    data-ouia-component-id="OUIA-Generated-Nav-5"
     data-ouia-component-type="PF4/Nav"
     data-ouia-safe="true"
   >
@@ -83,7 +83,7 @@ exports[`Nav Default Nav List - Trigger item active update 1`] = `
     >
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-9"
+        data-ouia-component-id="OUIA-Generated-NavItem-17"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -96,7 +96,7 @@ exports[`Nav Default Nav List - Trigger item active update 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-10"
+        data-ouia-component-id="OUIA-Generated-NavItem-18"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -109,7 +109,7 @@ exports[`Nav Default Nav List - Trigger item active update 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-11"
+        data-ouia-component-id="OUIA-Generated-NavItem-19"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -122,7 +122,7 @@ exports[`Nav Default Nav List - Trigger item active update 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-12"
+        data-ouia-component-id="OUIA-Generated-NavItem-20"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -326,7 +326,7 @@ exports[`Nav Expandable Nav List 1`] = `
   <nav
     aria-label="Global"
     class="pf-c-nav"
-    data-ouia-component-id="OUIA-Generated-Nav-4"
+    data-ouia-component-id="OUIA-Generated-Nav-6"
     data-ouia-component-type="PF4/Nav"
     data-ouia-safe="true"
   >
@@ -377,7 +377,7 @@ exports[`Nav Expandable Nav List 1`] = `
           >
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-13"
+              data-ouia-component-id="OUIA-Generated-NavItem-21"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -390,7 +390,7 @@ exports[`Nav Expandable Nav List 1`] = `
             </li>
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-14"
+              data-ouia-component-id="OUIA-Generated-NavItem-22"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -403,7 +403,7 @@ exports[`Nav Expandable Nav List 1`] = `
             </li>
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-15"
+              data-ouia-component-id="OUIA-Generated-NavItem-23"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -416,7 +416,7 @@ exports[`Nav Expandable Nav List 1`] = `
             </li>
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-16"
+              data-ouia-component-id="OUIA-Generated-NavItem-24"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -440,7 +440,7 @@ exports[`Nav Expandable Nav List with aria label 1`] = `
   <nav
     aria-label="Test"
     class="pf-c-nav"
-    data-ouia-component-id="OUIA-Generated-Nav-6"
+    data-ouia-component-id="OUIA-Generated-Nav-8"
     data-ouia-component-type="PF4/Nav"
     data-ouia-safe="true"
   >
@@ -496,7 +496,7 @@ exports[`Nav Expandable Nav List with aria label 1`] = `
           >
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-21"
+              data-ouia-component-id="OUIA-Generated-NavItem-29"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -509,7 +509,7 @@ exports[`Nav Expandable Nav List with aria label 1`] = `
             </li>
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-22"
+              data-ouia-component-id="OUIA-Generated-NavItem-30"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -522,7 +522,7 @@ exports[`Nav Expandable Nav List with aria label 1`] = `
             </li>
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-23"
+              data-ouia-component-id="OUIA-Generated-NavItem-31"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -535,7 +535,7 @@ exports[`Nav Expandable Nav List with aria label 1`] = `
             </li>
             <li
               class="pf-c-nav__item"
-              data-ouia-component-id="OUIA-Generated-NavItem-24"
+              data-ouia-component-id="OUIA-Generated-NavItem-32"
               data-ouia-component-type="PF4/NavItem"
               data-ouia-safe="true"
             >
@@ -587,7 +587,7 @@ exports[`Nav Horizontal Nav List 1`] = `
     >
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-33"
+        data-ouia-component-id="OUIA-Generated-NavItem-41"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -600,7 +600,7 @@ exports[`Nav Horizontal Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-34"
+        data-ouia-component-id="OUIA-Generated-NavItem-42"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -613,7 +613,7 @@ exports[`Nav Horizontal Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-35"
+        data-ouia-component-id="OUIA-Generated-NavItem-43"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -626,7 +626,7 @@ exports[`Nav Horizontal Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-36"
+        data-ouia-component-id="OUIA-Generated-NavItem-44"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -694,7 +694,7 @@ exports[`Nav Horizontal SubNav List 1`] = `
     >
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-37"
+        data-ouia-component-id="OUIA-Generated-NavItem-45"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -707,7 +707,7 @@ exports[`Nav Horizontal SubNav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-38"
+        data-ouia-component-id="OUIA-Generated-NavItem-46"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -720,7 +720,7 @@ exports[`Nav Horizontal SubNav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-39"
+        data-ouia-component-id="OUIA-Generated-NavItem-47"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -733,7 +733,7 @@ exports[`Nav Horizontal SubNav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-40"
+        data-ouia-component-id="OUIA-Generated-NavItem-48"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -773,7 +773,7 @@ exports[`Nav Nav Grouped List 1`] = `
   <nav
     aria-label="Global"
     class="pf-c-nav"
-    data-ouia-component-id="OUIA-Generated-Nav-7"
+    data-ouia-component-id="OUIA-Generated-Nav-9"
     data-ouia-component-type="PF4/Nav"
     data-ouia-safe="true"
   >
@@ -795,7 +795,7 @@ exports[`Nav Nav Grouped List 1`] = `
         >
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-25"
+            data-ouia-component-id="OUIA-Generated-NavItem-33"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -808,7 +808,7 @@ exports[`Nav Nav Grouped List 1`] = `
           </li>
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-26"
+            data-ouia-component-id="OUIA-Generated-NavItem-34"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -821,7 +821,7 @@ exports[`Nav Nav Grouped List 1`] = `
           </li>
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-27"
+            data-ouia-component-id="OUIA-Generated-NavItem-35"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -834,7 +834,7 @@ exports[`Nav Nav Grouped List 1`] = `
           </li>
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-28"
+            data-ouia-component-id="OUIA-Generated-NavItem-36"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -866,7 +866,7 @@ exports[`Nav Nav Grouped List 1`] = `
         >
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-29"
+            data-ouia-component-id="OUIA-Generated-NavItem-37"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -879,7 +879,7 @@ exports[`Nav Nav Grouped List 1`] = `
           </li>
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-30"
+            data-ouia-component-id="OUIA-Generated-NavItem-38"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -892,7 +892,7 @@ exports[`Nav Nav Grouped List 1`] = `
           </li>
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-31"
+            data-ouia-component-id="OUIA-Generated-NavItem-39"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -905,7 +905,7 @@ exports[`Nav Nav Grouped List 1`] = `
           </li>
           <li
             class="pf-c-nav__item"
-            data-ouia-component-id="OUIA-Generated-NavItem-32"
+            data-ouia-component-id="OUIA-Generated-NavItem-40"
             data-ouia-component-type="PF4/NavItem"
             data-ouia-safe="true"
           >
@@ -956,7 +956,7 @@ exports[`Nav Nav List with custom item nodes 1`] = `
     >
       <li
         class="pf-c-nav__item test-nav-item-class"
-        data-ouia-component-id="OUIA-Generated-NavItem-45"
+        data-ouia-component-id="OUIA-Generated-NavItem-53"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -990,6 +990,75 @@ exports[`Nav Nav List with custom item nodes 1`] = `
 </DocumentFragment>
 `;
 
+exports[`Nav Renders nav list in strict mode 1`] = `
+<DocumentFragment>
+  <nav
+    aria-label="Global"
+    class="pf-c-nav test-nav-class"
+    data-ouia-component-id="OUIA-Generated-Nav-3"
+    data-ouia-component-type="PF4/Nav"
+    data-ouia-safe="true"
+  >
+    <ul
+      class="pf-c-nav__list test-nav-list-class"
+    >
+      <li
+        class="pf-c-nav__item test-nav-item-class"
+        data-ouia-component-id="OUIA-Generated-NavItem-6"
+        data-ouia-component-type="PF4/NavItem"
+        data-ouia-safe="true"
+      >
+        <a
+          class="pf-c-nav__link test-nav-item-class"
+          href="#link1"
+        >
+          Link 1
+        </a>
+      </li>
+      <li
+        class="pf-c-nav__item test-nav-item-class"
+        data-ouia-component-id="OUIA-Generated-NavItem-8"
+        data-ouia-component-type="PF4/NavItem"
+        data-ouia-safe="true"
+      >
+        <a
+          class="pf-c-nav__link test-nav-item-class"
+          href="#link2"
+        >
+          Link 2
+        </a>
+      </li>
+      <li
+        class="pf-c-nav__item test-nav-item-class"
+        data-ouia-component-id="OUIA-Generated-NavItem-10"
+        data-ouia-component-type="PF4/NavItem"
+        data-ouia-safe="true"
+      >
+        <a
+          class="pf-c-nav__link test-nav-item-class"
+          href="#link3"
+        >
+          Link 3
+        </a>
+      </li>
+      <li
+        class="pf-c-nav__item test-nav-item-class"
+        data-ouia-component-id="OUIA-Generated-NavItem-12"
+        data-ouia-component-type="PF4/NavItem"
+        data-ouia-safe="true"
+      >
+        <a
+          class="pf-c-nav__link test-nav-item-class"
+          href="#link4"
+        >
+          Link 4
+        </a>
+      </li>
+    </ul>
+  </nav>
+</DocumentFragment>
+`;
+
 exports[`Nav Tertiary Nav List 1`] = `
 <DocumentFragment>
   <nav
@@ -1023,7 +1092,7 @@ exports[`Nav Tertiary Nav List 1`] = `
     >
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-41"
+        data-ouia-component-id="OUIA-Generated-NavItem-49"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -1036,7 +1105,7 @@ exports[`Nav Tertiary Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-42"
+        data-ouia-component-id="OUIA-Generated-NavItem-50"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -1049,7 +1118,7 @@ exports[`Nav Tertiary Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-43"
+        data-ouia-component-id="OUIA-Generated-NavItem-51"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
@@ -1062,7 +1131,7 @@ exports[`Nav Tertiary Nav List 1`] = `
       </li>
       <li
         class="pf-c-nav__item"
-        data-ouia-component-id="OUIA-Generated-NavItem-44"
+        data-ouia-component-id="OUIA-Generated-NavItem-52"
         data-ouia-component-type="PF4/NavItem"
         data-ouia-safe="true"
       >
diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
index 7b24f054d09..2af1f684dd1 100644
--- a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
+++ b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
@@ -47,6 +47,8 @@ export interface OptionsMenuProps
    * menuAppendTo={document.getElementById('target')}
    */
   menuAppendTo?: HTMLElement | (() => HTMLElement) | 'inline' | 'parent';
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({
@@ -61,6 +63,7 @@ export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({
   menuAppendTo = 'inline',
   ouiaId,
   ouiaSafe = true,
+  removeFindDomNode = false,
   ...props
 }: OptionsMenuProps) => (
   <DropdownContext.Provider
@@ -88,6 +91,7 @@ export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({
       isGrouped={isGrouped}
       toggle={toggle}
       menuAppendTo={menuAppendTo}
+      removeFindDomNode={removeFindDomNode}
       {...props}
     />
   </DropdownContext.Provider>
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx b/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx
index 123f6a772fa..b45fd5b2d88 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx
@@ -31,6 +31,23 @@ describe('optionsMenu', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
+  test('renders in strict mode', () => {
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = render(
+      <React.StrictMode>
+        <OptionsMenu
+          removeFindDomNode
+          id="regular"
+          menuItems={menuItems}
+          isOpen
+          toggle={<OptionsMenuToggle>Options Menu</OptionsMenuToggle>}
+        />
+      </React.StrictMode>
+    );
+    expect(consoleError).not.toHaveBeenCalled();
+    expect(asFragment()).toMatchSnapshot();
+  });
+
   test('right aligned', () => {
     const { asFragment } = render(
       <OptionsMenu
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
index 8db56ebf7f9..e84588eda57 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`optionsMenu expanded 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu pf-m-expanded"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-5"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-7"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="expanded"
@@ -14,7 +14,7 @@ exports[`optionsMenu expanded 1`] = `
       aria-haspopup="listbox"
       aria-label="Options menu"
       class="pf-c-options-menu__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="expanded-toggle"
@@ -68,7 +68,7 @@ exports[`optionsMenu expanded 1`] = `
             <button
               aria-disabled="false"
               class="pf-c-options-menu__menu-item"
-              data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-13"
               data-ouia-component-type="PF4/DropdownItem"
               data-ouia-safe="true"
               role="menuitem"
@@ -85,7 +85,7 @@ exports[`optionsMenu expanded 1`] = `
             <button
               aria-disabled="false"
               class="pf-c-options-menu__menu-item"
-              data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-14"
               data-ouia-component-type="PF4/DropdownItem"
               data-ouia-safe="true"
               role="menuitem"
@@ -102,7 +102,7 @@ exports[`optionsMenu expanded 1`] = `
             <button
               aria-disabled="true"
               class="pf-m-disabled pf-c-options-menu__menu-item"
-              data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-15"
               data-ouia-component-type="PF4/DropdownItem"
               data-ouia-safe="true"
               role="menuitem"
@@ -119,7 +119,7 @@ exports[`optionsMenu expanded 1`] = `
             <button
               aria-disabled="false"
               class="pf-c-options-menu__menu-item"
-              data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-16"
               data-ouia-component-type="PF4/DropdownItem"
               data-ouia-safe="true"
               role="menuitem"
@@ -158,7 +158,7 @@ exports[`optionsMenu expanded 1`] = `
             <button
               aria-disabled="false"
               class="pf-c-options-menu__menu-item"
-              data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-17"
               data-ouia-component-type="PF4/DropdownItem"
               data-ouia-safe="true"
               role="menuitem"
@@ -175,7 +175,7 @@ exports[`optionsMenu expanded 1`] = `
             <button
               aria-disabled="false"
               class="pf-c-options-menu__menu-item"
-              data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-18"
               data-ouia-component-type="PF4/DropdownItem"
               data-ouia-safe="true"
               role="menuitem"
@@ -200,7 +200,7 @@ exports[`optionsMenu isDisabled 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-8"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-10"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="disabled"
@@ -210,7 +210,7 @@ exports[`optionsMenu isDisabled 1`] = `
       aria-haspopup="listbox"
       aria-label="Options menu"
       class="pf-c-options-menu__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       disabled=""
@@ -246,7 +246,7 @@ exports[`optionsMenu open up 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu pf-m-top"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-3"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-5"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="openUp"
@@ -256,7 +256,7 @@ exports[`optionsMenu open up 1`] = `
       aria-haspopup="listbox"
       aria-label="Options menu"
       class="pf-c-options-menu__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="openUp-toggle"
@@ -291,7 +291,7 @@ exports[`optionsMenu plain 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-6"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-8"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="plain"
@@ -301,7 +301,7 @@ exports[`optionsMenu plain 1`] = `
       aria-haspopup="listbox"
       aria-label="Options menu"
       class="pf-c-options-menu__toggle pf-m-plain"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="plain-toggle"
@@ -358,11 +358,207 @@ exports[`optionsMenu regular 1`] = `
 </DocumentFragment>
 `;
 
+exports[`optionsMenu renders in strict mode 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-options-menu pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-3"
+    data-ouia-component-type="PF4/OptionsMenu"
+    data-ouia-safe="true"
+    id="regular"
+  >
+    <button
+      aria-expanded="true"
+      aria-haspopup="listbox"
+      aria-label="Options menu"
+      class="pf-c-options-menu__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe="true"
+      id="regular-toggle"
+      type="button"
+    >
+      <span
+        class="pf-c-options-menu__toggle-text"
+      />
+      <span
+        class="pf-c-options-menu__toggle-icon"
+      >
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 320 512"
+          width="1em"
+        >
+          <path
+            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+          />
+        </svg>
+      </span>
+    </button>
+    <ul
+      aria-labelledby="regular-toggle"
+      class="pf-c-options-menu__menu"
+      role="menu"
+    >
+      <section
+        class="pf-c-options-menu__group"
+        index="0"
+        role="none"
+      >
+        <h1
+          class="pf-c-options-menu__group-title"
+        >
+          Sort order
+        </h1>
+        <ul
+          aria-label=""
+          class=""
+          role="group"
+        >
+          <li
+            id=""
+            role="none"
+          >
+            <button
+              aria-disabled="false"
+              class="pf-c-options-menu__menu-item"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+              data-ouia-component-type="PF4/DropdownItem"
+              data-ouia-safe="true"
+              role="menuitem"
+              tabindex="-1"
+              type="button"
+            >
+              Name
+            </button>
+          </li>
+          <li
+            id=""
+            role="none"
+          >
+            <button
+              aria-disabled="false"
+              class="pf-c-options-menu__menu-item"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+              data-ouia-component-type="PF4/DropdownItem"
+              data-ouia-safe="true"
+              role="menuitem"
+              tabindex="-1"
+              type="button"
+            >
+              Date
+            </button>
+          </li>
+          <li
+            id=""
+            role="none"
+          >
+            <button
+              aria-disabled="true"
+              class="pf-m-disabled pf-c-options-menu__menu-item"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+              data-ouia-component-type="PF4/DropdownItem"
+              data-ouia-safe="true"
+              role="menuitem"
+              tabindex="-1"
+              type="button"
+            >
+              Disabled
+            </button>
+          </li>
+          <li
+            id=""
+            role="none"
+          >
+            <button
+              aria-disabled="false"
+              class="pf-c-options-menu__menu-item"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+              data-ouia-component-type="PF4/DropdownItem"
+              data-ouia-safe="true"
+              role="menuitem"
+              tabindex="-1"
+              type="button"
+            >
+              Size
+            </button>
+          </li>
+        </ul>
+      </section>
+      <li
+        class="pf-c-divider"
+        index="1"
+        role="separator"
+      />
+      <section
+        class="pf-c-options-menu__group"
+        index="2"
+        role="none"
+      >
+        <h1
+          class="pf-c-options-menu__group-title"
+        >
+          Sort direction
+        </h1>
+        <ul
+          aria-label=""
+          class=""
+          role="group"
+        >
+          <li
+            id=""
+            role="none"
+          >
+            <button
+              aria-disabled="false"
+              class="pf-c-options-menu__menu-item"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+              data-ouia-component-type="PF4/DropdownItem"
+              data-ouia-safe="true"
+              role="menuitem"
+              tabindex="-1"
+              type="button"
+            >
+              Ascending
+            </button>
+          </li>
+          <li
+            id=""
+            role="none"
+          >
+            <button
+              aria-disabled="false"
+              class="pf-c-options-menu__menu-item"
+              data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+              data-ouia-component-type="PF4/DropdownItem"
+              data-ouia-safe="true"
+              role="menuitem"
+              tabindex="-1"
+              type="button"
+            >
+              Descending
+            </button>
+          </li>
+          <li
+            class="pf-c-divider"
+            role="separator"
+          />
+        </ul>
+      </section>
+    </ul>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`optionsMenu right aligned + open up 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu pf-m-top pf-m-align-right"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-4"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-6"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="rightAlignedOpenUp"
@@ -372,7 +568,7 @@ exports[`optionsMenu right aligned + open up 1`] = `
       aria-haspopup="listbox"
       aria-label="Options menu"
       class="pf-c-options-menu__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="rightAlignedOpenUp-toggle"
@@ -407,7 +603,7 @@ exports[`optionsMenu right aligned 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu pf-m-align-right"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-2"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-4"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="rightAligned"
@@ -417,7 +613,7 @@ exports[`optionsMenu right aligned 1`] = `
       aria-haspopup="listbox"
       aria-label="Options menu"
       class="pf-c-options-menu__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="rightAligned-toggle"
@@ -452,14 +648,14 @@ exports[`optionsMenu text 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-options-menu"
-    data-ouia-component-id="OUIA-Generated-OptionsMenu-7"
+    data-ouia-component-id="OUIA-Generated-OptionsMenu-9"
     data-ouia-component-type="PF4/OptionsMenu"
     data-ouia-safe="true"
     id="text"
   >
     <div
       class="pf-c-options-menu__toggle pf-m-text"
-      id="pf-dropdown-toggle-id-6"
+      id="pf-dropdown-toggle-id-8"
     >
       <span
         class="pf-c-options-menu__toggle-text"
diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx
index 6434ba30ec6..b0485696b78 100644
--- a/packages/react-core/src/components/Popover/Popover.tsx
+++ b/packages/react-core/src/components/Popover/Popover.tsx
@@ -203,6 +203,8 @@ export interface PopoverProps {
   boundary?: 'scrollParent' | 'window' | 'viewport' | HTMLElement;
   /** @deprecated - no longer used */
   tippyProps?: Partial<TippyProps>;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 const alertStyle = {
@@ -252,6 +254,7 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
   reference,
   hasNoPadding = false,
   hasAutoWidth = false,
+  removeFindDomNode = false,
   ...rest
 }: PopoverProps) => {
   if (process.env.NODE_ENV !== 'production') {
@@ -466,6 +469,7 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
         enableFlip={enableFlip}
         zIndex={zIndex}
         flipBehavior={flipBehavior}
+        removeFindDomNode={removeFindDomNode}
       />
     </PopoverContext.Provider>
   );
diff --git a/packages/react-core/src/components/Popover/PopoverCloseButton.tsx b/packages/react-core/src/components/Popover/PopoverCloseButton.tsx
index 7134be352da..616c9b5c1fe 100644
--- a/packages/react-core/src/components/Popover/PopoverCloseButton.tsx
+++ b/packages/react-core/src/components/Popover/PopoverCloseButton.tsx
@@ -1,27 +1,16 @@
 import * as React from 'react';
 import { Button } from '../Button';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
-import { FindRefWrapper } from '../../helpers/Popper/FindRefWrapper';
 
 export const PopoverCloseButton: React.FunctionComponent<PopoverCloseButtonProps> = ({
   onClose = () => undefined as void,
   ...props
-}: PopoverCloseButtonProps) => {
-  const [closeButtonElement, setCloseButtonElement] = React.useState(null);
-  React.useEffect(() => {
-    closeButtonElement && closeButtonElement.addEventListener('click', onClose, false);
-    return () => {
-      closeButtonElement && closeButtonElement.removeEventListener('click', onClose, false);
-    };
-  }, [closeButtonElement]);
-  return (
-    <FindRefWrapper onFoundRef={(foundRef: any) => setCloseButtonElement(foundRef)}>
-      <Button variant="plain" aria-label {...props} style={{ pointerEvents: 'auto' }}>
-        <TimesIcon />
-      </Button>
-    </FindRefWrapper>
-  );
-};
+}: PopoverCloseButtonProps) => (
+  <Button onClick={onClose} variant="plain" aria-label {...props} style={{ pointerEvents: 'auto' }}>
+    <TimesIcon />
+  </Button>
+);
+
 PopoverCloseButton.displayName = 'PopoverCloseButton';
 
 export interface PopoverCloseButtonProps {
diff --git a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
index 56599461540..af1ed66c261 100644
--- a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
@@ -90,3 +90,28 @@ test('popover can close from content (uncontrolled)', () => {
   );
   expect(asFragment()).toMatchSnapshot();
 });
+
+test('popover renders in strict mode', () => {
+  const consoleError = jest.spyOn(console, 'error');
+  const { asFragment } = render(
+    <React.StrictMode>
+      <Popover
+        id="test"
+        position="top"
+        isVisible
+        hideOnOutsideClick
+        headerContent={<div>Popover Header</div>}
+        bodyContent={
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
+          </div>
+        }
+        removeFindDomNode
+      >
+        <div>Toggle Popover</div>
+      </Popover>
+    </React.StrictMode>
+  );
+  expect(consoleError).not.toHaveBeenCalled();
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap b/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
index 7c4c0ca4662..111dd2d55b9 100644
--- a/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
+++ b/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
@@ -33,3 +33,13 @@ exports[`popover renders close-button, header and body 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`popover renders in strict mode 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      Toggle Popover
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index 6ecf6288c41..d1c9897e304 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -90,6 +90,8 @@ export interface SearchInputProps extends Omit<React.HTMLProps<HTMLDivElement>,
    * appendTo={document.getElementById('target')}
    */
   appendTo?: HTMLElement | (() => HTMLElement) | 'inline';
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
@@ -120,6 +122,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   submitSearchButtonLabel = 'Search',
   isDisabled = false,
   appendTo,
+  removeFindDomNode = false,
   ...props
 }: SearchInputProps) => {
   const [isSearchMenuOpen, setIsSearchMenuOpen] = React.useState(false);
@@ -316,6 +319,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
             isVisible={isSearchMenuOpen}
             enableFlip={true}
             appendTo={() => appendTo || searchInputRef.current}
+            removeFindDomNode={removeFindDomNode}
           />
         </div>
       );
diff --git a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
index 1eeaeec013f..21ff4d6e6a4 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
+++ b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
@@ -33,6 +33,32 @@ describe('SearchInput', () => {
     expect(screen.getByTestId('test-id').querySelector('.pf-c-badge')).toBeInTheDocument();
   });
 
+  test('renders search input in strict mode', async () => {
+    const user = userEvent.setup();
+
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = render(
+      <React.StrictMode>
+        <SearchInput
+          attributes={[
+            { attr: 'username', display: 'Username' },
+            { attr: 'firstname', display: 'First name' }
+          ]}
+          advancedSearchDelimiter=":"
+          value="username:player firstname:john"
+          onChange={props.onChange}
+          onSearch={props.onSearch}
+          onClear={props.onClear}
+          removeFindDomNode
+        />
+      </React.StrictMode>
+    );
+    await user.click(screen.getByRole('button', { name: 'Search' }));
+    expect(consoleError).not.toHaveBeenCalled();
+    expect(props.onSearch).toHaveBeenCalled();
+    expect(asFragment()).toMatchSnapshot();
+  });
+
   test('navigable search results', async () => {
     const user = userEvent.setup();
 
@@ -110,7 +136,7 @@ describe('SearchInput', () => {
     await user.click(screen.getByRole('button', { name: 'Search' }));
 
     await user.click(screen.getByRole('button', { name: 'Open advanced search' }));
-    expect(screen.getByTestId('test-id')).toContainElement(screen.getByText('First name'))
+    expect(screen.getByTestId('test-id')).toContainElement(screen.getByText('First name'));
 
     expect(props.onSearch).toHaveBeenCalled();
     expect(asFragment()).toMatchSnapshot();
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index d74704b59d5..0d47549c590 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`SearchInput advanced search 1`] = `
             aria-disabled="false"
             aria-label="Reset"
             class="pf-c-button pf-m-plain"
-            data-ouia-component-id="OUIA-Generated-Button-plain-15"
+            data-ouia-component-id="OUIA-Generated-Button-plain-17"
             data-ouia-component-type="PF4/Button"
             data-ouia-safe="true"
             type="button"
@@ -75,7 +75,7 @@ exports[`SearchInput advanced search 1`] = `
         aria-expanded="false"
         aria-label="Open advanced search"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-6"
+        data-ouia-component-id="OUIA-Generated-Button-control-10"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -98,7 +98,7 @@ exports[`SearchInput advanced search 1`] = `
         aria-disabled="false"
         aria-label="Search"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-7"
+        data-ouia-component-id="OUIA-Generated-Button-control-11"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="submit"
@@ -172,7 +172,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
             aria-disabled="false"
             aria-label="Reset"
             class="pf-c-button pf-m-plain"
-            data-ouia-component-id="OUIA-Generated-Button-plain-16"
+            data-ouia-component-id="OUIA-Generated-Button-plain-18"
             data-ouia-component-type="PF4/Button"
             data-ouia-safe="true"
             type="button"
@@ -198,7 +198,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
         aria-expanded="true"
         aria-label="Open advanced search"
         class="pf-c-button pf-m-control pf-m-expanded"
-        data-ouia-component-id="OUIA-Generated-Button-control-8"
+        data-ouia-component-id="OUIA-Generated-Button-control-12"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="button"
@@ -221,7 +221,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
         aria-disabled="false"
         aria-label="Search"
         class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-9"
+        data-ouia-component-id="OUIA-Generated-Button-control-13"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe="true"
         type="submit"
@@ -436,6 +436,130 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
 </DocumentFragment>
 `;
 
+exports[`SearchInput renders search input in strict mode 1`] = `
+<DocumentFragment>
+  <div
+    class=""
+  >
+    <div>
+      <div
+        class="pf-c-input-group"
+      >
+        <div
+          class="pf-c-text-input-group"
+        >
+          <div
+            class="pf-c-text-input-group__main pf-m-icon"
+          >
+            <span
+              class="pf-c-text-input-group__text"
+            >
+              <span
+                class="pf-c-text-input-group__icon"
+              >
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                  />
+                </svg>
+              </span>
+              <input
+                aria-label="Search input"
+                class="pf-c-text-input-group__text-input"
+                type="text"
+                value="username:player firstname:john"
+              />
+            </span>
+          </div>
+          <div
+            class="pf-c-text-input-group__utilities"
+          >
+            <button
+              aria-disabled="false"
+              aria-label="Reset"
+              class="pf-c-button pf-m-plain"
+              data-ouia-component-id="OUIA-Generated-Button-plain-11"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                style="vertical-align: -0.125em;"
+                viewBox="0 0 352 512"
+                width="1em"
+              >
+                <path
+                  d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-label="Open advanced search"
+          class="pf-c-button pf-m-control"
+          data-ouia-component-id="OUIA-Generated-Button-control-5"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 320 512"
+            width="1em"
+          >
+            <path
+              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+            />
+          </svg>
+        </button>
+        <button
+          aria-disabled="false"
+          aria-label="Search"
+          class="pf-c-button pf-m-control"
+          data-ouia-component-id="OUIA-Generated-Button-control-7"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          type="submit"
+        >
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"
+            />
+          </svg>
+        </button>
+      </div>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`SearchInput search input with hint 1`] = `
 <DocumentFragment>
   <div
diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx
index e9bcf22b9ff..ac0bfb51fb6 100644
--- a/packages/react-core/src/components/Select/Select.tsx
+++ b/packages/react-core/src/components/Select/Select.tsx
@@ -180,6 +180,8 @@ export interface SelectProps
    * appended inline, e.g. `menuAppendTo="parent"`
    */
   isFlipEnabled?: boolean;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export interface SelectState {
@@ -254,7 +256,8 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
     isInputFilterPersisted: false,
     isCreateSelectOptionObject: false,
     shouldResetOnSelect: true,
-    isFlipEnabled: false
+    isFlipEnabled: false,
+    removeFindDomNode: false
   };
 
   state: SelectState = {
@@ -1005,6 +1008,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
       isCreateSelectOptionObject,
       shouldResetOnSelect,
       isFlipEnabled,
+      removeFindDomNode,
       ...props
     } = this.props;
     const {
@@ -1448,6 +1452,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                 direction={direction}
                 appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
                 isVisible={isOpen}
+                removeFindDomNode={removeFindDomNode}
               />
             )}
           </SelectContext.Provider>
diff --git a/packages/react-core/src/components/Select/__tests__/Select.test.tsx b/packages/react-core/src/components/Select/__tests__/Select.test.tsx
index e9e681b9545..34c86f8582b 100644
--- a/packages/react-core/src/components/Select/__tests__/Select.test.tsx
+++ b/packages/react-core/src/components/Select/__tests__/Select.test.tsx
@@ -81,6 +81,27 @@ describe('Select', () => {
       );
       expect(asFragment()).toMatchSnapshot();
     });
+
+    test('renders expanded in strict mode successfully', () => {
+      const consoleError = jest.spyOn(console, 'error');
+      const { asFragment } = render(
+        <React.StrictMode>
+          <Select
+            removeFindDomNode
+            variant={SelectVariant.single}
+            onSelect={jest.fn()}
+            onToggle={jest.fn()}
+            isOpen
+            ouiaId="test-id"
+          >
+            {selectOptions}
+          </Select>
+        </React.StrictMode>
+      );
+      expect(consoleError).not.toHaveBeenCalled();
+      expect(asFragment()).toMatchSnapshot();
+    });
+
     test('renders expanded successfully with custom objects', () => {
       const { asFragment } = render(
         <Select variant={SelectVariant.single} onSelect={jest.fn()} onToggle={jest.fn()} isOpen ouiaId="test-id">
@@ -525,14 +546,9 @@ describe('select with placeholder', () => {
 
 test('applies focus styling to the create option when reached via keyboard navigation', async () => {
   const user = userEvent.setup();
-  
+
   render(
-    <Select
-      variant={SelectVariant.typeahead}
-      onToggle={() => {}}
-      isOpen
-      isCreatable
-    >
+    <Select variant={SelectVariant.typeahead} onToggle={() => {}} isOpen isCreatable>
       {selectOptions}
     </Select>
   );
diff --git a/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap b/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
index 20894d69e95..3bbfb29c2c1 100644
--- a/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
+++ b/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
@@ -12,9 +12,9 @@ exports[`Select renders select groups successfully 1`] = `
       aria-expanded="true"
       aria-haspopup="listbox"
       aria-label="Options menu"
-      aria-labelledby=" pf-select-toggle-id-2"
+      aria-labelledby=" pf-select-toggle-id-4"
       class="pf-c-select__toggle"
-      id="pf-select-toggle-id-2"
+      id="pf-select-toggle-id-4"
       type="button"
     >
       <div
@@ -329,6 +329,112 @@ exports[`Select single select renders disabled successfully 1`] = `
 </DocumentFragment>
 `;
 
+exports[`Select single select renders expanded in strict mode successfully 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-c-select pf-m-expanded"
+    data-ouia-component-id="test-id"
+    data-ouia-component-type="PF4/Select"
+    data-ouia-safe="true"
+  >
+    <button
+      aria-expanded="true"
+      aria-haspopup="listbox"
+      aria-label="Options menu"
+      aria-labelledby=" pf-select-toggle-id-1"
+      class="pf-c-select__toggle"
+      id="pf-select-toggle-id-1"
+      type="button"
+    >
+      <div
+        class="pf-c-select__toggle-wrapper"
+      >
+        <span
+          class="pf-c-select__toggle-text"
+        >
+          Mr
+        </span>
+      </div>
+      <span
+        class="pf-c-select__toggle-arrow"
+      >
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 320 512"
+          width="1em"
+        >
+          <path
+            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+          />
+        </svg>
+      </span>
+    </button>
+    <ul
+      aria-label=""
+      class="pf-c-select__menu"
+      role="listbox"
+    >
+      <li
+        class="pf-c-select__menu-wrapper"
+        id="option-1"
+        role="presentation"
+      >
+        <button
+          class="pf-c-select__menu-item"
+          role="option"
+          type="button"
+        >
+          Mr
+        </button>
+      </li>
+      <li
+        class="pf-c-select__menu-wrapper"
+        id="option-2"
+        role="presentation"
+      >
+        <button
+          class="pf-c-select__menu-item"
+          role="option"
+          type="button"
+        >
+          Mrs
+        </button>
+      </li>
+      <li
+        class="pf-c-select__menu-wrapper"
+        id="option-3"
+        role="presentation"
+      >
+        <button
+          class="pf-c-select__menu-item"
+          role="option"
+          type="button"
+        >
+          Ms
+        </button>
+      </li>
+      <li
+        class="pf-c-select__menu-wrapper"
+        id="option-4"
+        role="presentation"
+      >
+        <button
+          class="pf-c-select__menu-item"
+          role="option"
+          type="button"
+        >
+          Other
+        </button>
+      </li>
+    </ul>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`Select single select renders expanded successfully 1`] = `
 <DocumentFragment>
   <div
@@ -447,9 +553,9 @@ exports[`Select single select renders expanded successfully with custom objects
       aria-expanded="true"
       aria-haspopup="listbox"
       aria-label="Options menu"
-      aria-labelledby=" pf-select-toggle-id-1"
+      aria-labelledby=" pf-select-toggle-id-3"
       class="pf-c-select__toggle"
-      id="pf-select-toggle-id-1"
+      id="pf-select-toggle-id-3"
       type="button"
     >
       <div
@@ -539,9 +645,9 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
     <button
       aria-expanded="true"
       aria-label="Options menu"
-      aria-labelledby=" pf-select-toggle-id-6"
+      aria-labelledby=" pf-select-toggle-id-8"
       class="pf-c-select__toggle"
-      id="pf-select-toggle-id-6"
+      id="pf-select-toggle-id-8"
       type="button"
     >
       <div
@@ -591,7 +697,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Mr"
+              id="pf-random-id-16-Mr"
               type="checkbox"
             />
             <span
@@ -605,7 +711,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Mrs"
+              id="pf-random-id-16-Mrs"
               type="checkbox"
             />
             <span
@@ -619,7 +725,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Ms"
+              id="pf-random-id-16-Ms"
               type="checkbox"
             />
             <span
@@ -633,7 +739,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Other"
+              id="pf-random-id-16-Other"
               type="checkbox"
             />
             <span
@@ -663,7 +769,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Mr"
+              id="pf-random-id-16-Mr"
               type="checkbox"
             />
             <span
@@ -677,7 +783,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Mrs"
+              id="pf-random-id-16-Mrs"
               type="checkbox"
             />
             <span
@@ -691,7 +797,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Ms"
+              id="pf-random-id-16-Ms"
               type="checkbox"
             />
             <span
@@ -705,7 +811,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
           >
             <input
               class="pf-c-check__input"
-              id="pf-random-id-14-Other"
+              id="pf-random-id-16-Other"
               type="checkbox"
             />
             <span
@@ -876,9 +982,9 @@ exports[`checkbox select renders expanded successfully 1`] = `
     <button
       aria-expanded="true"
       aria-label="Options menu"
-      aria-labelledby=" pf-select-toggle-id-4"
+      aria-labelledby=" pf-select-toggle-id-6"
       class="pf-c-select__toggle"
-      id="pf-select-toggle-id-4"
+      id="pf-select-toggle-id-6"
       type="button"
     >
       <div
@@ -916,7 +1022,7 @@ exports[`checkbox select renders expanded successfully 1`] = `
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-11-Mr"
+          id="pf-random-id-13-Mr"
           type="checkbox"
         />
         <span
@@ -930,7 +1036,7 @@ exports[`checkbox select renders expanded successfully 1`] = `
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-11-Mrs"
+          id="pf-random-id-13-Mrs"
           type="checkbox"
         />
         <span
@@ -944,7 +1050,7 @@ exports[`checkbox select renders expanded successfully 1`] = `
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-11-Ms"
+          id="pf-random-id-13-Ms"
           type="checkbox"
         />
         <span
@@ -958,7 +1064,7 @@ exports[`checkbox select renders expanded successfully 1`] = `
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-11-Other"
+          id="pf-random-id-13-Other"
           type="checkbox"
         />
         <span
@@ -983,9 +1089,9 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
     <button
       aria-expanded="true"
       aria-label="Options menu"
-      aria-labelledby=" pf-select-toggle-id-5"
+      aria-labelledby=" pf-select-toggle-id-7"
       class="pf-c-select__toggle"
-      id="pf-select-toggle-id-5"
+      id="pf-select-toggle-id-7"
       type="button"
     >
       <div
@@ -1023,7 +1129,7 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-13-Mr: User One"
+          id="pf-random-id-15-Mr: User One"
           type="checkbox"
         />
         <span
@@ -1037,7 +1143,7 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-13-Mrs: New User"
+          id="pf-random-id-15-Mrs: New User"
           type="checkbox"
         />
         <span
@@ -1051,7 +1157,7 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
       >
         <input
           class="pf-c-check__input"
-          id="pf-random-id-13-Ms: Test Three"
+          id="pf-random-id-15-Ms: Test Three"
           type="checkbox"
         />
         <span
@@ -1131,7 +1237,7 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
         >
           <input
             class="pf-c-check__input"
-            id="pf-random-id-12-Mr"
+            id="pf-random-id-14-Mr"
             type="checkbox"
           />
           <span
@@ -1145,7 +1251,7 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
         >
           <input
             class="pf-c-check__input"
-            id="pf-random-id-12-Mrs"
+            id="pf-random-id-14-Mrs"
             type="checkbox"
           />
           <span
@@ -1159,7 +1265,7 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
         >
           <input
             class="pf-c-check__input"
-            id="pf-random-id-12-Ms"
+            id="pf-random-id-14-Ms"
             type="checkbox"
           />
           <span
@@ -1173,7 +1279,7 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
         >
           <input
             class="pf-c-check__input"
-            id="pf-random-id-12-Other"
+            id="pf-random-id-14-Other"
             type="checkbox"
           />
           <span
@@ -1200,9 +1306,9 @@ exports[`renders select with favorites successfully 1`] = `
       aria-expanded="true"
       aria-haspopup="listbox"
       aria-label="Options menu"
-      aria-labelledby=" pf-select-toggle-id-3"
+      aria-labelledby=" pf-select-toggle-id-5"
       class="pf-c-select__toggle"
-      id="pf-select-toggle-id-3"
+      id="pf-select-toggle-id-5"
       type="button"
     >
       <div
@@ -1622,7 +1728,7 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
           aria-label=""
           autocomplete="off"
           class="pf-c-form-control pf-c-select__toggle-typeahead"
-          id="pf-select-toggle-id-17-select-multi-typeahead-typeahead"
+          id="pf-select-toggle-id-19-select-multi-typeahead-typeahead"
           placeholder=""
           type="text"
           value=""
@@ -1632,9 +1738,9 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
         aria-expanded="true"
         aria-haspopup="listbox"
         aria-label="Options menu"
-        aria-labelledby=" pf-select-toggle-id-17"
+        aria-labelledby=" pf-select-toggle-id-19"
         class="pf-c-button pf-c-select__toggle-button pf-m-plain"
-        id="pf-select-toggle-id-17"
+        id="pf-select-toggle-id-19"
         tabindex="-1"
         type="button"
       >
@@ -1756,19 +1862,19 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                 >
                   <span
                     class="pf-c-chip__text"
-                    id="pf-random-id-23"
+                    id="pf-random-id-25"
                   >
                     Mr
                   </span>
                   <button
                     aria-disabled="false"
                     aria-label="Remove"
-                    aria-labelledby="remove_pf-random-id-23 pf-random-id-23"
+                    aria-labelledby="remove_pf-random-id-25 pf-random-id-25"
                     class="pf-c-button pf-m-plain"
                     data-ouia-component-id="Remove"
                     data-ouia-component-type="PF4/Button"
                     data-ouia-safe="true"
-                    id="remove_pf-random-id-23"
+                    id="remove_pf-random-id-25"
                     type="button"
                   >
                     <svg
@@ -1798,19 +1904,19 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                 >
                   <span
                     class="pf-c-chip__text"
-                    id="pf-random-id-24"
+                    id="pf-random-id-26"
                   >
                     Mrs
                   </span>
                   <button
                     aria-disabled="false"
                     aria-label="Remove"
-                    aria-labelledby="remove_pf-random-id-24 pf-random-id-24"
+                    aria-labelledby="remove_pf-random-id-26 pf-random-id-26"
                     class="pf-c-button pf-m-plain"
                     data-ouia-component-id="Remove"
                     data-ouia-component-type="PF4/Button"
                     data-ouia-safe="true"
-                    id="remove_pf-random-id-24"
+                    id="remove_pf-random-id-26"
                     type="button"
                   >
                     <svg
@@ -2039,7 +2145,7 @@ exports[`typeahead select renders expanded successfully 1`] = `
           aria-label=""
           autocomplete="off"
           class="pf-c-form-control pf-c-select__toggle-typeahead"
-          id="pf-select-toggle-id-7-select-typeahead"
+          id="pf-select-toggle-id-9-select-typeahead"
           placeholder=""
           type="text"
           value=""
@@ -2049,9 +2155,9 @@ exports[`typeahead select renders expanded successfully 1`] = `
         aria-expanded="true"
         aria-haspopup="listbox"
         aria-label="Options menu"
-        aria-labelledby=" pf-select-toggle-id-7"
+        aria-labelledby=" pf-select-toggle-id-9"
         class="pf-c-button pf-c-select__toggle-button pf-m-plain"
-        id="pf-select-toggle-id-7"
+        id="pf-select-toggle-id-9"
         tabindex="-1"
         type="button"
       >
@@ -2151,7 +2257,7 @@ exports[`typeahead select renders selected successfully 1`] = `
           aria-label=""
           autocomplete="off"
           class="pf-c-form-control pf-c-select__toggle-typeahead"
-          id="pf-select-toggle-id-8-select-typeahead"
+          id="pf-select-toggle-id-10-select-typeahead"
           placeholder=""
           type="text"
           value="Mr"
@@ -2161,9 +2267,9 @@ exports[`typeahead select renders selected successfully 1`] = `
         aria-expanded="true"
         aria-haspopup="listbox"
         aria-label="Options menu"
-        aria-labelledby=" pf-select-toggle-id-8"
+        aria-labelledby=" pf-select-toggle-id-10"
         class="pf-c-button pf-c-select__toggle-button pf-m-plain"
-        id="pf-select-toggle-id-8"
+        id="pf-select-toggle-id-10"
         tabindex="-1"
         type="button"
       >
diff --git a/packages/react-core/src/components/Tabs/OverflowTab.tsx b/packages/react-core/src/components/Tabs/OverflowTab.tsx
index 0ba47419e4f..faf696d6979 100644
--- a/packages/react-core/src/components/Tabs/OverflowTab.tsx
+++ b/packages/react-core/src/components/Tabs/OverflowTab.tsx
@@ -19,6 +19,8 @@ export interface OverflowTabProps extends React.HTMLProps<HTMLLIElement> {
   defaultTitleText?: string;
   /** The aria label applied to the button which toggles the tab overflow menu */
   toggleAriaLabel?: string;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
@@ -27,6 +29,7 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
   showTabCount,
   defaultTitleText = 'More',
   toggleAriaLabel,
+  removeFindDomNode = false,
   ...props
 }: OverflowTabProps) => {
   const menuRef = React.useRef<HTMLDivElement>();
@@ -135,6 +138,7 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
       isVisible={isExpanded}
       popperMatchesTriggerWidth={false}
       appendTo={overflowLIRef.current}
+      removeFindDomNode={removeFindDomNode}
     />
   );
 };
diff --git a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
index 9146785bbbc..5174344c00e 100644
--- a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
@@ -176,9 +176,33 @@ test('Renders tabs passed via overflowingTabs when expanded', async () => {
   expect(screen.getByText('Tab two')).toBeVisible();
 });
 
+test('Renders tabs passed via overflowingTabs when expanded in strict mode', async () => {
+  const user = userEvent.setup();
+
+  const consoleError = jest.spyOn(console, 'error');
+  const { asFragment } = render(
+    <React.StrictMode>
+      <OverflowTab
+        removeFindDomNode
+        overflowingTabs={[
+          { title: 'Tab one', eventKey: 1 },
+          { title: 'Tab two', eventKey: 2 }
+        ]}
+      />
+    </React.StrictMode>
+  );
+
+  await user.click(screen.getByRole('tab', { name: 'More' }));
+
+  expect(consoleError).not.toHaveBeenCalled();
+  expect(screen.getByText('Tab one')).toBeVisible();
+  expect(screen.getByText('Tab two')).toBeVisible();
+  expect(asFragment()).toMatchSnapshot();
+});
+
 test('Closes the overflowing tabs menu when a tab is selected', async () => {
   const user = userEvent.setup();
-  
+
   render(
     <TabsContext.Provider value={{ ...tabsContextDefaultProps, localActiveKey: 0 }}>
       <OverflowTab
@@ -200,7 +224,7 @@ test('Closes the overflowing tabs menu when a tab is selected', async () => {
 
 test('Closes the overflowing tabs menu when the user clicks outside of the menu', async () => {
   const user = userEvent.setup();
-  
+
   render(
     <TabsContext.Provider value={{ ...tabsContextDefaultProps, localActiveKey: 0 }}>
       <OverflowTab
@@ -336,7 +360,7 @@ test('Renders the tab with aria-expanded set to false by default', () => {
 
 test('Renders the tab with aria-expanded set to true when the menu is opened', async () => {
   const user = userEvent.setup();
-  
+
   render(<OverflowTab />);
 
   const overflowTab = screen.getByRole('tab');
@@ -355,7 +379,7 @@ test('Passes Popper popperMatchesTriggerWidth set to false', () => {
 
 test('Passes Popper an appendTo value of the presentation element', async () => {
   const user = userEvent.setup();
-  
+
   render(<OverflowTab />);
 
   await user.click(screen.getByRole('tab'));
@@ -366,7 +390,7 @@ test('Passes Popper an appendTo value of the presentation element', async () =>
 
 test('Does not render an overflowing tab as a selected menu item by default', async () => {
   const user = userEvent.setup();
-  
+
   render(
     <TabsContext.Provider value={{ ...tabsContextDefaultProps, localActiveKey: 0 }}>
       <OverflowTab
@@ -385,7 +409,7 @@ test('Does not render an overflowing tab as a selected menu item by default', as
 
 test('Renders an overflowing tab as a selected menu item when its key matches the localActiveKey provided via context', async () => {
   const user = userEvent.setup();
-  
+
   render(
     <TabsContext.Provider value={{ ...tabsContextDefaultProps, localActiveKey: 1 }}>
       <OverflowTab
@@ -404,7 +428,7 @@ test('Renders an overflowing tab as a selected menu item when its key matches th
 
 test('Matches snapshot when expanded', async () => {
   const user = userEvent.setup();
-  
+
   const { asFragment } = render(
     <TabsContext.Provider value={{ ...tabsContextDefaultProps, localActiveKey: 1 }}>
       <OverflowTab
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap
index 8f42040dd29..121967a487a 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap
@@ -88,3 +88,92 @@ exports[`Matches snapshot when expanded 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`Renders tabs passed via overflowingTabs when expanded in strict mode 1`] = `
+<DocumentFragment>
+  <div
+    data-testid="popper-mock"
+  >
+    <div
+      data-testid="trigger"
+    >
+      <li
+        class="pf-c-tabs__item pf-m-overflow"
+        role="presentation"
+      >
+        <button
+          aria-expanded="true"
+          aria-haspopup="menu"
+          class="pf-c-tabs__link pf-m-expanded"
+          role="tab"
+          type="button"
+        >
+          <span
+            class="pf-c-tabs__item-text"
+          >
+            More
+          </span>
+          <span
+            class="pf-c-tabs__link-toggle-icon"
+          >
+            <svg
+              aria-hidden="true"
+              fill="currentColor"
+              height="1em"
+              role="img"
+              style="vertical-align: -0.125em;"
+              viewBox="0 0 256 512"
+              width="1em"
+            >
+              <path
+                d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
+              />
+            </svg>
+          </span>
+        </button>
+      </li>
+    </div>
+    <div
+      data-testid="popper"
+    >
+      <div
+        data-testid="menu-mock"
+      >
+        <div
+          data-testid="menu-content-mock"
+        >
+          <ul
+            data-testid="menu-list-mock"
+          >
+            <li
+              id="1-menu-item-mock"
+            >
+              Tab one
+              <p>
+                Selected: false
+              </p>
+            </li>
+            <li
+              id="2-menu-item-mock"
+            >
+              Tab two
+              <p>
+                Selected: false
+              </p>
+            </li>
+          </ul>
+        </div>
+        <button>
+          Select
+        </button>
+      </div>
+    </div>
+    <p>
+      Popper matches trigger width: false
+    </p>
+    <p>
+      Append to class name: pf-c-tabs__item pf-m-overflow
+    </p>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/TimePicker/TimePicker.tsx b/packages/react-core/src/components/TimePicker/TimePicker.tsx
index ea83d55ae75..3983310965b 100644
--- a/packages/react-core/src/components/TimePicker/TimePicker.tsx
+++ b/packages/react-core/src/components/TimePicker/TimePicker.tsx
@@ -71,6 +71,8 @@ export interface TimePickerProps
   isOpen?: boolean;
   /** Handler invoked each time the open state of time picker updates */
   setIsOpen?: (isOpen?: boolean) => void;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 interface TimePickerState {
@@ -108,7 +110,8 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
     minTime: '',
     maxTime: '',
     isOpen: false,
-    setIsOpen: () => {}
+    setIsOpen: () => {},
+    removeFindDomNode: false
   };
 
   constructor(props: TimePickerProps) {
@@ -441,6 +444,7 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
       maxTime,
       includeSeconds,
       /* eslint-enable @typescript-eslint/no-unused-vars */
+      removeFindDomNode,
       ...props
     } = this.props;
     const { timeState, isTimeOptionsOpen, isInvalid, minTimeState, maxTimeState } = this.state;
@@ -514,6 +518,7 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
                   trigger={textInput}
                   popper={menuContainer}
                   isVisible={isTimeOptionsOpen}
+                  removeFindDomNode={removeFindDomNode}
                 />
               </div>
             </div>
diff --git a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
index f078c009b05..94b1fe34838 100644
--- a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
+++ b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
@@ -6,6 +6,21 @@ import userEvent from '@testing-library/user-event';
 import { TimePicker, TimePickerProps } from '../TimePicker';
 
 describe('TimePicker', () => {
+  test('Renders in strict mode', () => {
+    const validateTime = (_time: string) => {
+      return true;
+    };
+
+    const consoleError = jest.spyOn(console, 'error');
+    const { asFragment } = render(
+      <React.StrictMode>
+        <TimePicker removeFindDomNode value={'00:00'} validateTime={validateTime} aria-label="time picker" />
+      </React.StrictMode>
+    );
+    expect(consoleError).not.toHaveBeenCalled();
+    expect(screen.getByLabelText('time picker')).not.toHaveClass('pf-m-error');
+  });
+
   describe('test timepicker onChange method with valid values', () => {
     const testOnChange = async ({
       inputProps,
@@ -20,7 +35,7 @@ describe('TimePicker', () => {
       render(<TimePicker onChange={onChange} {...inputProps} aria-label="time picker" />);
 
       await user.type(screen.getByLabelText('time picker'), String(inputProps.value));
-      expect(onChange).toHaveBeenCalledWith(inputProps.value, expects.hour, expects.minutes, expects.seconds, true)
+      expect(onChange).toHaveBeenCalledWith(inputProps.value, expects.hour, expects.minutes, expects.seconds, true);
     };
 
     test('should return the correct value using the AM/PM pattern - midnight', async () => {
diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx
index 4087decd35f..041f7713064 100644
--- a/packages/react-core/src/components/Tooltip/Tooltip.tsx
+++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx
@@ -138,6 +138,8 @@ export interface TooltipProps extends Omit<React.HTMLProps<HTMLDivElement>, 'con
   isAppLauncher?: boolean;
   /** @deprecated - no longer used */
   tippyProps?: Partial<TippyProps>;
+  /** @beta Opt-in for updated popper that does not use findDOMNode. */
+  removeFindDomNode?: boolean;
 }
 
 // id for associating trigger with the content aria-describedby or aria-labelledby
@@ -168,6 +170,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   boundary,
   isAppLauncher,
   tippyProps,
+  removeFindDomNode = false,
   ...rest
 }: TooltipProps) => {
   if (process.env.NODE_ENV !== 'production') {
@@ -331,6 +334,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
       enableFlip={enableFlip}
       zIndex={zIndex}
       flipBehavior={flipBehavior}
+      removeFindDomNode={removeFindDomNode}
     />
   );
 };
diff --git a/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx b/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx
index ea1e31910aa..1be872adbe0 100644
--- a/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx
+++ b/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx
@@ -17,3 +17,24 @@ test('tooltip renders', () => {
   );
   expect(asFragment()).toMatchSnapshot();
 });
+
+test('tooltip renders in strict mode', () => {
+  const consoleError = jest.spyOn(console, 'error');
+  const { asFragment } = render(
+    <React.StrictMode>
+      <Tooltip
+        removeFindDomNode
+        position="top"
+        content={
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
+          </div>
+        }
+      >
+        <div>Toggle tooltip</div>
+      </Tooltip>
+    </React.StrictMode>
+  );
+  expect(consoleError).not.toHaveBeenCalled();
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap b/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
index 210e96b48ce..570cd7fa1e6 100644
--- a/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
+++ b/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
@@ -7,3 +7,13 @@ exports[`tooltip renders 1`] = `
   </div>
 </DocumentFragment>
 `;
+
+exports[`tooltip renders in strict mode 1`] = `
+<DocumentFragment>
+  <div>
+    <div>
+      Toggle tooltip
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/helpers/FocusTrap/FocusTrap.tsx b/packages/react-core/src/helpers/FocusTrap/FocusTrap.tsx
index a069f009d4c..a2a96a7d597 100644
--- a/packages/react-core/src/helpers/FocusTrap/FocusTrap.tsx
+++ b/packages/react-core/src/helpers/FocusTrap/FocusTrap.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { createFocusTrap, Options as FocusTrapOptions, FocusTrap as IFocusTrap } from 'focus-trap';
 
-interface FocusTrapProps extends React.HTMLProps<HTMLDivElement> {
+interface FocusTrapProps extends Omit<React.HTMLProps<HTMLDivElement>, 'ref'> {
   children: React.ReactNode;
   className?: string;
   active?: boolean;
@@ -9,13 +9,15 @@ interface FocusTrapProps extends React.HTMLProps<HTMLDivElement> {
   focusTrapOptions?: FocusTrapOptions;
   /** Prevent from scrolling to the previously focused element on deactivation */
   preventScrollOnDeactivate?: boolean;
+  /** @hide Forwarded ref */
+  innerRef?: React.Ref<HTMLDivElement>;
 }
 
-export class FocusTrap extends React.Component<FocusTrapProps> {
+class FocusTrapBase extends React.Component<FocusTrapProps> {
   static displayName = 'FocusTrap';
   previouslyFocusedElement: HTMLElement;
   focusTrap: IFocusTrap;
-  divRef = React.createRef<HTMLDivElement>();
+  divRef = (this.props.innerRef as React.RefObject<HTMLDivElement>) || React.createRef<HTMLDivElement>();
 
   static defaultProps = {
     active: true,
@@ -76,8 +78,18 @@ export class FocusTrap extends React.Component<FocusTrapProps> {
   }
 
   render() {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { children, className, focusTrapOptions, active, paused, preventScrollOnDeactivate, ...rest } = this.props;
+    const {
+      children,
+      className,
+      /* eslint-disable @typescript-eslint/no-unused-vars */
+      focusTrapOptions,
+      active,
+      paused,
+      preventScrollOnDeactivate,
+      innerRef,
+      /* eslint-enable @typescript-eslint/no-unused-vars */
+      ...rest
+    } = this.props;
     return (
       <div ref={this.divRef} className={className} {...rest}>
         {children}
@@ -85,3 +97,7 @@ export class FocusTrap extends React.Component<FocusTrapProps> {
     );
   }
 }
+
+export const FocusTrap = React.forwardRef((props: FocusTrapProps, ref: React.Ref<any>) => (
+  <FocusTrapBase innerRef={ref} {...props} />
+));
diff --git a/packages/react-core/src/helpers/Popper/Popper.tsx b/packages/react-core/src/helpers/Popper/Popper.tsx
index 165e6386af3..f07d4ba41e4 100644
--- a/packages/react-core/src/helpers/Popper/Popper.tsx
+++ b/packages/react-core/src/helpers/Popper/Popper.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { FindRefWrapper } from './FindRefWrapper';
 import { usePopper } from './thirdparty/react-popper/usePopper';
 import { Placement, BasePlacement, Modifier } from './thirdparty/popper-core';
 import { css } from '@patternfly/react-styles';
+import { FindRefWrapper } from './FindRefWrapper';
 import '@patternfly/react-styles/css/components/Popper/Popper.css';
 
 const hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };
@@ -38,6 +38,7 @@ export interface PopperProps {
   /**
    * The reference element to which the Popover is relatively placed to.
    * Use either trigger or reference, not both.
+   * Passing this property or the removeFindDomNode property, will bypass the use of findDOMNode for the trigger in react strict mode.
    */
   reference?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
   /** The popper (menu/tooltip/popover) element */
@@ -122,6 +123,10 @@ export interface PopperProps {
         | 'right-start'
         | 'right-end'
       )[];
+  /** @beta Bypasses the use of findDOMNode for both the popper and trigger in react strict mode. Without this flag, the trigger and popper will require passed references via the reference property (trigger) and popperRef property (popper) for strict mode. */
+  removeFindDomNode?: boolean;
+  /** @beta Reference to the popper (menu/tooltip/popover) element. Passing this property or the removeFindDomNode property, will bypass the use of findDOMNode for the popper in react strict mode. The popper property is still required. */
+  popperRef?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
 }
 
 export const Popper: React.FunctionComponent<PopperProps> = ({
@@ -149,11 +154,13 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
   onDocumentKeyDown,
   enableFlip = true,
   flipBehavior = 'flip',
-  reference
+  reference,
+  removeFindDomNode = false,
+  popperRef
 }) => {
   const [triggerElement, setTriggerElement] = React.useState(null);
   const [refElement, setRefElement] = React.useState<HTMLElement>(null);
-  const [popperElement, setPopperElement] = React.useState(null);
+  const [popperElement, setPopperElement] = React.useState<HTMLElement>(null);
   const [ready, setReady] = React.useState(false);
   const refOrTrigger = refElement || triggerElement;
   const onDocumentClickCallback = React.useCallback(
@@ -173,6 +180,16 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
       }
     }
   }, [reference]);
+  React.useEffect(() => {
+    // When the popperRef is defined or the popper visiblity changes, ensure the popper element is up to date
+    if (popperRef) {
+      if ((popperRef as React.RefObject<any>).current) {
+        setPopperElement((popperRef as React.RefObject<any>).current);
+      } else if (typeof popperRef === 'function') {
+        setPopperElement(popperRef());
+      }
+    }
+  }, [isVisible, popperRef]);
   const addEventListener = (listener: any, element: Document | HTMLElement, event: string) => {
     if (listener && element) {
       element.addEventListener(event, listener);
@@ -305,7 +322,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     return positionModifiers.top;
   };
 
-  const menuWithPopper = React.cloneElement(popper, {
+  const options = {
     className: css(popper.props && popper.props.className, positionModifiers && modifierFromPopperPosition()),
     style: {
       ...((popper.props && popper.props.style) || {}),
@@ -313,7 +330,9 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
       zIndex
     },
     ...attributes.popper
-  });
+  };
+
+  const menuWithPopper = React.cloneElement(popper, options);
 
   const getTarget: () => HTMLElement = () => {
     if (typeof appendTo === 'function') {
@@ -322,17 +341,40 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     return appendTo;
   };
 
+  /**
+   * To enable strict mode, the popper must either have its reference defined via the popperRef property,
+   * or the removeFindDomNode flag must be present. Even if the reference is passed in, unlike the trigger,
+   * the popper property must still be passed.
+   * The trigger must similarly have either its reference defined via the reference property, or the
+   * removeFindDomNode flag must be present. The trigger property is not required when the reference is passed.
+   *
+   * Strict mode may be enabled by passing both reference properties to Popper, or by passing the
+   * removeFindDomNode flag with either reference property, or by solely passing the removeFindDomNode
+   * flag.
+   */
+  let popperPortal;
+  if (removeFindDomNode) {
+    // If removeFindDomNode is passed, use the removeFindDomNode method of wrapping divs
+    popperPortal = <div ref={node => setPopperElement(node?.firstElementChild as HTMLElement)}>{menuWithPopper}</div>;
+  } else if (popperRef) {
+    // If removeFindDomNode is not passed and popperRef is passed, use the popperRef method
+    popperPortal = menuWithPopper;
+  } else {
+    // If neither removeFindDomNode and popperRef exist, use the old method of FindRefWrapper
+    popperPortal = (
+      <FindRefWrapper onFoundRef={(foundRef: any) => setPopperElement(foundRef)}>{menuWithPopper}</FindRefWrapper>
+    );
+  }
+
   return (
     <>
-      {!reference && trigger && (
+      {!reference && trigger && React.isValidElement(trigger) && !removeFindDomNode && (
         <FindRefWrapper onFoundRef={(foundRef: any) => setTriggerElement(foundRef)}>{trigger}</FindRefWrapper>
       )}
-      {ready &&
-        isVisible &&
-        ReactDOM.createPortal(
-          <FindRefWrapper onFoundRef={(foundRef: any) => setPopperElement(foundRef)}>{menuWithPopper}</FindRefWrapper>,
-          getTarget()
-        )}
+      {!reference && trigger && React.isValidElement(trigger) && removeFindDomNode && (
+        <div ref={node => setTriggerElement(node?.firstElementChild as HTMLElement)}>{trigger}</div>
+      )}
+      {ready && isVisible && ReactDOM.createPortal(popperPortal, getTarget())}
     </>
   );
 };
diff --git a/packages/react-integration/cypress/integration/tabshorizontaloverflow.spec.ts b/packages/react-integration/cypress/integration/tabshorizontaloverflow.spec.ts
index 2f53086b60d..2e7253fea5e 100644
--- a/packages/react-integration/cypress/integration/tabshorizontaloverflow.spec.ts
+++ b/packages/react-integration/cypress/integration/tabshorizontaloverflow.spec.ts
@@ -73,6 +73,7 @@ describe('Tab Demo Test', () => {
   it('Allows overflow tab customization via HorizontalOverflowObject properties', () => {
     // verify that tab count can be shown and that the count updates on resize
     cy.get('#toggle-show-count-overflow').click();
+    cy.viewport(800, 792);
     cy.contains('.pf-c-tabs__link', 'More (5)').should('exist');
     cy.viewport(700, 792);
     cy.contains('.pf-c-tabs__link', 'More (6)').should('exist');