diff --git a/package.json b/package.json
index c9d8a75da2cc04..72309e07bde772 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.1.0-canary.2",
     "@elastic/ems-client": "8.0.0",
-    "@elastic/eui": "46.1.0",
+    "@elastic/eui": "48.1.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
@@ -336,7 +336,7 @@
     "re2": "^1.16.0",
     "react": "^16.12.0",
     "react-ace": "^7.0.5",
-    "react-beautiful-dnd": "^13.0.0",
+    "react-beautiful-dnd": "^13.1.0",
     "react-color": "^2.13.8",
     "react-dom": "^16.12.0",
     "react-dropzone": "^4.2.9",
diff --git a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
index d4a3bd3a7ea742..df924685f09015 100644
--- a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
+++ b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
@@ -83,7 +83,7 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiDataGrid.ariaLabelledBy": [Function],
           "euiDataGrid.screenReaderNotice": "Cell contains interactive content.",
           "euiDataGridCell.position": [Function],
-          "euiDataGridCellButtons.expandButtonTitle": "Click or hit enter to interact with cell content",
+          "euiDataGridCellActions.expandButtonTitle": "Click or hit enter to interact with cell content",
           "euiDataGridHeaderCell.headerActions": "Header actions",
           "euiDataGridPagination.detailedPaginationLabel": [Function],
           "euiDataGridPagination.paginationLabel": "Pagination for preceding grid",
@@ -206,10 +206,15 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiSelectable.noAvailableOptions": "No options available",
           "euiSelectable.noMatchingOptions": [Function],
           "euiSelectable.placeholderName": "Filter options",
+          "euiSelectable.screenReaderInstructions": "Use up and down arrows to move focus over options. Enter to select. Escape to collapse options.",
+          "euiSelectable.searchResults": [Function],
+          "euiSelectableListItem.checkedOption": "Checked option.",
+          "euiSelectableListItem.checkedOptionInstructions": "To uncheck this option, press enter.",
           "euiSelectableListItem.excludedOption": "Excluded option.",
-          "euiSelectableListItem.excludedOptionInstructions": "To deselect this option, press enter.",
-          "euiSelectableListItem.includedOption": "Included option.",
+          "euiSelectableListItem.excludedOptionInstructions": "To uncheck this option, press enter.",
+          "euiSelectableListItem.includedOption": "Selected option.",
           "euiSelectableListItem.includedOptionInstructions": "To exclude this option, press enter.",
+          "euiSelectableListItem.unckeckedOptionInstructions": "To select this option, press enter.",
           "euiSelectableTemplateSitewide.loadingResults": "Loading results",
           "euiSelectableTemplateSitewide.noResults": "No results available",
           "euiSelectableTemplateSitewide.onFocusBadgeGoTo": "Go to",
@@ -231,6 +236,12 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiStepStrings.simpleWarning": [Function],
           "euiStepStrings.step": [Function],
           "euiStepStrings.warning": [Function],
+          "euiSuggest.stateLoading": "State: loading.",
+          "euiSuggest.stateSaved": "State: saved.",
+          "euiSuggest.stateSavedTooltip": "Saved.",
+          "euiSuggest.stateUnchanged": "State: unchanged.",
+          "euiSuggest.stateUnsaved": "State: unsaved.",
+          "euiSuggest.stateUnsavedTooltip": "Changes have not been saved.",
           "euiSuperSelect.screenReaderAnnouncement": "You are in a form selector and must select a single option. Use the up and down keys to navigate or escape to close.",
           "euiSuperSelectControl.selectAnOption": [Function],
           "euiSuperUpdateButton.cannotUpdateTooltip": "Cannot update",
diff --git a/src/core/public/i18n/i18n_eui_mapping.test.ts b/src/core/public/i18n/i18n_eui_mapping.test.ts
index d8d48a8e5f1d5a..2b29fa4d0d66c9 100644
--- a/src/core/public/i18n/i18n_eui_mapping.test.ts
+++ b/src/core/public/i18n/i18n_eui_mapping.test.ts
@@ -76,7 +76,7 @@ describe('@elastic/eui i18n tokens', () => {
       test('defaultMessage is in sync with defString', () => {
         // Certain complex tokens (e.g. ones that have a function as a defaultMessage)
         // need custom i18n handling, and can't be checked for basic defString equality
-        const tokensToSkip = ['euiColumnSorting.buttonActive'];
+        const tokensToSkip = ['euiColumnSorting.buttonActive', 'euiSelectable.searchResults'];
         if (tokensToSkip.includes(token)) return;
 
         // Clean up typical errors from the `@elastic/eui` extraction token tool
diff --git a/src/core/public/i18n/i18n_eui_mapping.tsx b/src/core/public/i18n/i18n_eui_mapping.tsx
index 4603a2074c4d9f..135a515e1e22db 100644
--- a/src/core/public/i18n/i18n_eui_mapping.tsx
+++ b/src/core/public/i18n/i18n_eui_mapping.tsx
@@ -397,8 +397,8 @@ export const getEuiContextMapping = (): EuiTokensObject => {
         defaultMessage: 'Row: {row}; Column: {col}',
         values: { row, col },
       }),
-    'euiDataGridCellButtons.expandButtonTitle': i18n.translate(
-      'core.euiDataGridCellButtons.expandButtonTitle',
+    'euiDataGridCellActions.expandButtonTitle': i18n.translate(
+      'core.euiDataGridCellActions.expandButtonTitle',
       {
         defaultMessage: 'Click or hit enter to interact with cell content',
       }
@@ -954,13 +954,37 @@ export const getEuiContextMapping = (): EuiTokensObject => {
         values={{ searchValue }}
       />
     ),
+    'euiSelectable.screenReaderInstructions': i18n.translate(
+      'core.euiSelectable.screenReaderInstructions',
+      {
+        defaultMessage:
+          'Use up and down arrows to move focus over options. Enter to select. Escape to collapse options.',
+      }
+    ),
+    'euiSelectable.searchResults': ({ resultsLength }: EuiValues) =>
+      i18n.translate('core.euiSelectable.searchResults', {
+        defaultMessage: '{resultsLength, plural, one {# result} other {# results}}',
+        values: { resultsLength },
+      }),
     'euiSelectable.placeholderName': i18n.translate('core.euiSelectable.placeholderName', {
       defaultMessage: 'Filter options',
     }),
+    'euiSelectableListItem.checkedOption': i18n.translate(
+      'core.euiSelectableListItem.checkedOption',
+      {
+        defaultMessage: 'Checked option.',
+      }
+    ),
+    'euiSelectableListItem.checkedOptionInstructions': i18n.translate(
+      'core.euiSelectableListItem.checkedOptionInstructions',
+      {
+        defaultMessage: 'To uncheck this option, press enter.',
+      }
+    ),
     'euiSelectableListItem.includedOption': i18n.translate(
       'core.euiSelectableListItem.includedOption',
       {
-        defaultMessage: 'Included option.',
+        defaultMessage: 'Selected option.',
       }
     ),
     'euiSelectableListItem.includedOptionInstructions': i18n.translate(
@@ -978,7 +1002,13 @@ export const getEuiContextMapping = (): EuiTokensObject => {
     'euiSelectableListItem.excludedOptionInstructions': i18n.translate(
       'core.euiSelectableListItem.excludedOptionInstructions',
       {
-        defaultMessage: 'To deselect this option, press enter.',
+        defaultMessage: 'To uncheck this option, press enter.',
+      }
+    ),
+    'euiSelectableListItem.unckeckedOptionInstructions': i18n.translate(
+      'core.euiSelectableListItem.unckeckedOptionInstructions',
+      {
+        defaultMessage: 'To select this option, press enter.',
       }
     ),
     'euiSelectableTemplateSitewide.loadingResults': i18n.translate(
@@ -1088,6 +1118,28 @@ export const getEuiContextMapping = (): EuiTokensObject => {
         defaultMessage: 'Step {number} is loading',
         values: { number },
       }),
+    'euiSuggest.stateSavedTooltip': i18n.translate('core.euiSuggest.stateSavedTooltip', {
+      defaultMessage: 'Saved.',
+    }),
+
+    'euiSuggest.stateUnsavedTooltip': i18n.translate('core.euiSuggest.stateUnsavedTooltip', {
+      defaultMessage: 'Changes have not been saved.',
+    }),
+
+    'euiSuggest.stateLoading': i18n.translate('core.euiSuggest.stateLoading', {
+      defaultMessage: 'State: loading.',
+    }),
+
+    'euiSuggest.stateSaved': i18n.translate('core.euiSuggest.stateSaved', {
+      defaultMessage: 'State: saved.',
+    }),
+
+    'euiSuggest.stateUnsaved': i18n.translate('core.euiSuggest.stateUnsaved', {
+      defaultMessage: 'State: unsaved.',
+    }),
+    'euiSuggest.stateUnchanged': i18n.translate('core.euiSuggest.stateUnchanged', {
+      defaultMessage: 'State: unchanged.',
+    }),
     'euiSuperSelect.screenReaderAnnouncement': i18n.translate(
       'core.euiSuperSelect.screenReaderAnnouncement',
       {
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 6e05cf6d3f6b03..38cc61387e92c4 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -77,6 +77,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.0.0': ['Elastic License 2.0'],
-  '@elastic/eui@46.1.0': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@48.1.1': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index 4db3f780fdebe5..dcaba4c3f8e199 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -1292,11 +1292,13 @@ exports[`Inspector Data View component should render single table without select
                   >
                     <EuiFlexGroup
                       alignItems="center"
+                      className="eui-xScroll"
+                      gutterSize="s"
                       justifyContent="spaceBetween"
                       responsive={false}
                     >
                       <div
-                        className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+                        className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
                       >
                         <EuiFlexItem
                           grow={false}
@@ -2873,11 +2875,13 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                   >
                     <EuiFlexGroup
                       alignItems="center"
+                      className="eui-xScroll"
+                      gutterSize="s"
                       justifyContent="spaceBetween"
                       responsive={false}
                     >
                       <div
-                        className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+                        className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
                       >
                         <EuiFlexItem
                           grow={false}
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index f2f3666d4528df..aa8eefe523b822 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
       <label
         class="euiFormLabel euiFormRow__label"
         for="generated-id"
+        id="generated-id-label"
       >
         <span>
           Type
@@ -75,6 +76,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
       <label
         class="euiFormLabel euiFormRow__label"
         for="generated-id"
+        id="generated-id-label"
       >
         <span>
           Open in a new tab
@@ -137,6 +139,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
         aria-invalid="false"
         class="euiFormLabel euiFormRow__label"
         for="generated-id"
+        id="generated-id-label"
       >
         <span>
           URL template
@@ -200,6 +203,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
         aria-invalid="false"
         class="euiFormLabel euiFormRow__label"
         for="generated-id"
+        id="generated-id-label"
       >
         <span>
           Label template
@@ -262,6 +266,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
       <label
         class="euiFormLabel euiFormRow__label"
         for="generated-id"
+        id="generated-id-label"
       >
         <span>
           Samples
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
index 651004638a85eb..80fc27b50b40a1 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
@@ -40,7 +40,8 @@ describe('Discover cell actions ', function () {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           Component={(props: any) => <EuiButton {...props} />}
           rowIndex={1}
-          columnId={'extension'}
+          colIndex={1}
+          columnId="extension"
           isExpanded={false}
           closePopover={jest.fn()}
         />
@@ -68,7 +69,8 @@ describe('Discover cell actions ', function () {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           Component={(props: any) => <EuiButton {...props} />}
           rowIndex={1}
-          columnId={'extension'}
+          colIndex={1}
+          columnId="extension"
           isExpanded={false}
           closePopover={jest.fn()}
         />
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_document_selection.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_document_selection.test.tsx
index 2afee7a6a48a32..d416372ac183fd 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_document_selection.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_document_selection.test.tsx
@@ -57,6 +57,7 @@ describe('document selection', () => {
         <DiscoverGridContext.Provider value={contextMock}>
           <SelectButton
             rowIndex={0}
+            colIndex={0}
             setCellProps={jest.fn()}
             columnId="test"
             isExpanded={false}
@@ -80,6 +81,7 @@ describe('document selection', () => {
         <DiscoverGridContext.Provider value={contextMock}>
           <SelectButton
             rowIndex={0}
+            colIndex={0}
             setCellProps={jest.fn()}
             columnId="test"
             isExpanded={false}
@@ -102,6 +104,7 @@ describe('document selection', () => {
         <DiscoverGridContext.Provider value={contextMock}>
           <SelectButton
             rowIndex={0}
+            colIndex={0}
             setCellProps={jest.fn()}
             columnId="test"
             isExpanded={false}
@@ -125,6 +128,7 @@ describe('document selection', () => {
         <DiscoverGridContext.Provider value={contextMock}>
           <SelectButton
             rowIndex={0}
+            colIndex={0}
             setCellProps={jest.fn()}
             columnId="test"
             isExpanded={false}
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_expand_button.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_expand_button.test.tsx
index bb8341f746e851..27ee307d746ebf 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_expand_button.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_expand_button.test.tsx
@@ -35,6 +35,7 @@ describe('Discover grid view button ', function () {
       <DiscoverGridContext.Provider value={contextMock}>
         <ExpandButton
           rowIndex={0}
+          colIndex={0}
           setCellProps={jest.fn()}
           columnId="test"
           isExpanded={false}
@@ -57,6 +58,7 @@ describe('Discover grid view button ', function () {
       <DiscoverGridContext.Provider value={contextMock}>
         <ExpandButton
           rowIndex={0}
+          colIndex={0}
           setCellProps={jest.fn()}
           columnId="test"
           isExpanded={false}
@@ -79,6 +81,7 @@ describe('Discover grid view button ', function () {
       <DiscoverGridContext.Provider value={contextMock}>
         <ExpandButton
           rowIndex={1}
+          colIndex={0}
           setCellProps={jest.fn()}
           columnId="test"
           isExpanded={false}
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
index d3af215059af0e..0a4cf74c20a5fc 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
@@ -84,6 +84,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="bytes"
         isDetails={false}
         isExpanded={false}
@@ -106,6 +107,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="bytes"
         isDetails={true}
         isExpanded={false}
@@ -128,6 +130,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="bytes"
         isDetails={true}
         isExpanded={false}
@@ -150,6 +153,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="_source"
         isDetails={false}
         isExpanded={false}
@@ -223,6 +227,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="_source"
         isDetails={true}
         isExpanded={false}
@@ -265,6 +270,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="_source"
         isDetails={false}
         isExpanded={false}
@@ -343,6 +349,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="_source"
         isDetails={false}
         isExpanded={false}
@@ -420,6 +427,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="_source"
         isDetails={true}
         isExpanded={false}
@@ -467,6 +475,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="object"
         isDetails={false}
         isExpanded={false}
@@ -508,6 +517,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="object"
         isDetails={false}
         isExpanded={false}
@@ -548,6 +558,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="object"
         isDetails={true}
         isExpanded={false}
@@ -582,6 +593,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="object.value"
         isDetails={false}
         isExpanded={false}
@@ -614,6 +626,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={1}
+        colIndex={1}
         columnId="bytes"
         isDetails={false}
         isExpanded={false}
@@ -636,6 +649,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="bytes-invalid"
         isDetails={false}
         isExpanded={false}
@@ -671,6 +685,7 @@ describe('Discover grid cell rendering', function () {
     const component = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="unmapped"
         isDetails={false}
         isExpanded={false}
@@ -693,6 +708,7 @@ describe('Discover grid cell rendering', function () {
     const componentWithDetails = shallow(
       <DiscoverGridCellValue
         rowIndex={0}
+        colIndex={0}
         columnId="unmapped"
         isDetails={true}
         isExpanded={false}
diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap b/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
index 151bd91750daa3..64e940756539a7 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
@@ -32,12 +32,14 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
         <EuiFormLabel
           className="euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
           isFocused={false}
           type="label"
         >
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             <FormattedMessage
               defaultMessage="Frequency"
@@ -589,12 +591,14 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Time"
@@ -1698,12 +1702,14 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
         <EuiFormLabel
           className="euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
           isFocused={false}
           type="label"
         >
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             <FormattedMessage
               defaultMessage="Frequency"
@@ -2154,12 +2160,14 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Minute"
@@ -2911,12 +2919,14 @@ exports[`CronEditor is rendered with a MINUTE frequency 1`] = `
         <EuiFormLabel
           className="euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
           isFocused={false}
           type="label"
         >
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             <FormattedMessage
               defaultMessage="Frequency"
@@ -3127,12 +3137,14 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
         <EuiFormLabel
           className="euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
           isFocused={false}
           type="label"
         >
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             <FormattedMessage
               defaultMessage="Frequency"
@@ -3813,12 +3825,14 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Date"
@@ -4271,12 +4285,14 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Time"
@@ -5380,12 +5396,14 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
         <EuiFormLabel
           className="euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
           isFocused={false}
           type="label"
         >
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             <FormattedMessage
               defaultMessage="Frequency"
@@ -5970,12 +5988,14 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Day"
@@ -6188,12 +6208,14 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Time"
@@ -7297,12 +7319,14 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
         <EuiFormLabel
           className="euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
           isFocused={false}
           type="label"
         >
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             <FormattedMessage
               defaultMessage="Frequency"
@@ -8036,12 +8060,14 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Month"
@@ -8304,12 +8330,14 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Date"
@@ -8762,12 +8790,14 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
           <EuiFormLabel
             className="euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
             isFocused={false}
             type="label"
           >
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               <FormattedMessage
                 defaultMessage="Time"
diff --git a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
index 23918e7df3f8e0..2abeae31fbea9b 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
@@ -83,7 +83,7 @@ export const createGridColumns = (
                   data-test-subj="tbvChartCell__filterForCellValue"
                   onClick={() => {
                     onFilterClick({ row: rowIndex, column: colIndex, value: rowValue }, false);
-                    closePopover();
+                    closePopover?.();
                   }}
                   iconType="plusInCircle"
                 >
@@ -119,7 +119,7 @@ export const createGridColumns = (
                   aria-label={filterOutAriaLabel}
                   onClick={() => {
                     onFilterClick({ row: rowIndex, column: colIndex, value: rowValue }, true);
-                    closePopover();
+                    closePopover?.();
                   }}
                   iconType="minusInCircle"
                 >
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.ts b/test/functional/apps/dashboard/dashboard_filter_bar.ts
index 2f561f32201584..62eac2454ae966 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.ts
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.ts
@@ -193,8 +193,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         } else {
           const documentCell = await dataGrid.getCellElement(1, 3);
           await documentCell.click();
-          const expandCellContentButton = await documentCell.findByClassName(
-            'euiDataGridRowCell__expandButtonIcon'
+          const expandCellContentButton = await documentCell.findByTestSubject(
+            'euiDataGridCellExpandButton'
           );
           await expandCellContentButton.click();
           await testSubjects.click('filterForButton');
diff --git a/test/functional/apps/discover/_data_grid_doc_table.ts b/test/functional/apps/discover/_data_grid_doc_table.ts
index 0721c45c1f9fa5..bb0cd56298c201 100644
--- a/test/functional/apps/discover/_data_grid_doc_table.ts
+++ b/test/functional/apps/discover/_data_grid_doc_table.ts
@@ -76,8 +76,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
       const docCell = await dataGrid.getCellElement(0, 3);
       await docCell.click();
-      const expandCellContentButton = await docCell.findByClassName(
-        'euiDataGridRowCell__expandButtonIcon'
+      const expandCellContentButton = await docCell.findByTestSubject(
+        'euiDataGridCellExpandButton'
       );
       await expandCellContentButton.click();
       let expandDocId = '';
@@ -125,8 +125,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
       const docCell = await dataGrid.getCellElement(0, 3);
       await docCell.click();
-      const expandCellContentButton = await docCell.findByClassName(
-        'euiDataGridRowCell__expandButtonIcon'
+      const expandCellContentButton = await docCell.findByTestSubject(
+        'euiDataGridCellExpandButton'
       );
       await expandCellContentButton.click();
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
index f7c50907424fd5..e3badfa8330909 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -20,6 +20,7 @@ exports[`Storyshots arguments/AxisConfig extended 1`] = `
       <label
         className="euiFormLabel euiFormRow__label"
         htmlFor="generated-id"
+        id="generated-id-label"
       >
         Position
       </label>
@@ -97,6 +98,7 @@ exports[`Storyshots arguments/AxisConfig/components extended 1`] = `
       <label
         className="euiFormLabel euiFormRow__label"
         htmlFor="generated-id"
+        id="generated-id-label"
       >
         Position
       </label>
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
index dc66eef8090508..37edfb278b8395 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
@@ -66,6 +66,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Name
                   </label>
@@ -111,6 +112,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Description
                   </label>
@@ -147,6 +149,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Thumbnail image
                   </label>
@@ -375,6 +378,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Name
                   </label>
@@ -420,6 +424,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Description
                   </label>
@@ -456,6 +461,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Thumbnail image
                   </label>
@@ -681,6 +687,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Name
                   </label>
@@ -726,6 +733,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Description
                   </label>
@@ -762,6 +770,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Thumbnail image
                   </label>
@@ -982,6 +991,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Name
                   </label>
@@ -1027,6 +1037,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Description
                   </label>
@@ -1063,6 +1074,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                   <label
                     className="euiFormLabel euiFormRow__label"
                     htmlFor="generated-id"
+                    id="generated-id-label"
                   >
                     Thumbnail image
                   </label>
diff --git a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
index 12ca14a0a6286c..acbaccd2248f3e 100644
--- a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
@@ -853,7 +853,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
           className="euiSpacer euiSpacer--m"
         />
         <div
-          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
         >
           <div
             className="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
index 9500da484c626d..3033773505a53e 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -704,6 +704,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                 <button
                   aria-label="Clear input"
                   className="euiFormControlLayoutClearButton"
+                  data-test-subj="clearSearchButton"
                   onClick={[Function]}
                   type="button"
                 >
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
index 94d8f342952d66..6c70364f9679c4 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
@@ -72,6 +72,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Type
           </label>
@@ -104,6 +105,7 @@ Array [
             aria-invalid={false}
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Name
           </label>
@@ -141,6 +143,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Value
           </label>
@@ -359,6 +362,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Type
           </label>
@@ -391,6 +395,7 @@ Array [
             aria-invalid={false}
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Name
           </label>
@@ -428,6 +433,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Value
           </label>
@@ -587,6 +593,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Type
           </label>
@@ -619,6 +626,7 @@ Array [
             aria-invalid={false}
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Name
           </label>
@@ -656,6 +664,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Value
           </label>
@@ -790,6 +799,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Type
           </label>
@@ -822,6 +832,7 @@ Array [
             aria-invalid={false}
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Name
           </label>
@@ -859,6 +870,7 @@ Array [
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Value
           </label>
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
index 69aa40f388e45f..69b2d94a90d530 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -39,6 +39,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Padding
             </label>
@@ -79,6 +80,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Opacity
             </label>
@@ -164,6 +166,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Overflow
             </label>
@@ -247,6 +250,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Thickness
             </label>
@@ -287,6 +291,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Style
             </label>
@@ -322,6 +327,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Radius
             </label>
@@ -367,6 +373,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Color
             </label>
@@ -446,6 +453,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Padding
           </label>
@@ -486,6 +494,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Opacity
           </label>
@@ -571,6 +580,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Overflow
           </label>
@@ -653,6 +663,7 @@ exports[`Storyshots arguments/ContainerStyle/components border form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Thickness
           </label>
@@ -693,6 +704,7 @@ exports[`Storyshots arguments/ContainerStyle/components border form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Style
           </label>
@@ -728,6 +740,7 @@ exports[`Storyshots arguments/ContainerStyle/components border form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Radius
           </label>
@@ -773,6 +786,7 @@ exports[`Storyshots arguments/ContainerStyle/components border form 1`] = `
           <label
             className="euiFormLabel euiFormRow__label"
             htmlFor="generated-id"
+            id="generated-id-label"
           >
             Color
           </label>
@@ -863,6 +877,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Padding
             </label>
@@ -903,6 +918,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Opacity
             </label>
@@ -988,6 +1004,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Overflow
             </label>
@@ -1071,6 +1088,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Thickness
             </label>
@@ -1111,6 +1129,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Style
             </label>
@@ -1146,6 +1165,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Radius
             </label>
@@ -1191,6 +1211,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Color
             </label>
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
index 05add24cf775c6..214f613896f463 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -21,6 +21,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
         <label
           className="euiFormLabel euiFormRow__label"
           htmlFor="generated-id"
+          id="generated-id-label"
         >
           Series id
         </label>
@@ -99,6 +100,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Line
             </label>
@@ -184,6 +186,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Bar
             </label>
@@ -269,6 +272,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
             <label
               className="euiFormLabel euiFormRow__label"
               htmlFor="generated-id"
+              id="generated-id-label"
             >
               Point
             </label>
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
index 988aba48d976f5..0109e292ebc7c5 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
@@ -280,6 +280,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                             <label
                               class="euiFormLabel euiFormRow__label"
                               for="generated-id"
+                              id="generated-id-label"
                             >
                               Set a custom interval
                             </label>
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
index ecb59abc41ecc9..d6cb6b617cce4d 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
@@ -87,6 +87,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
               <label
                 className="euiFormLabel euiFormRow__label"
                 htmlFor="generated-id"
+                id="generated-id-label"
               >
                 Set a custom interval
               </label>
@@ -250,6 +251,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
               <label
                 className="euiFormLabel euiFormRow__label"
                 htmlFor="generated-id"
+                id="generated-id-label"
               >
                 Set a custom interval
               </label>
@@ -413,6 +415,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
               <label
                 className="euiFormLabel euiFormRow__label"
                 htmlFor="generated-id"
+                id="generated-id-label"
               >
                 Set a custom interval
               </label>
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
index 7cd45dffd5def5..bd35874bc352b5 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
@@ -53,6 +53,7 @@ describe('datatable cell renderer', () => {
       >
         <CellRenderer
           rowIndex={0}
+          colIndex={0}
           columnId="a"
           setCellProps={() => {}}
           isExpandable={false}
@@ -76,6 +77,7 @@ describe('datatable cell renderer', () => {
       >
         <CellRenderer
           rowIndex={0}
+          colIndex={0}
           columnId="a"
           setCellProps={() => {}}
           isExpandable={false}
@@ -154,6 +156,7 @@ describe('datatable cell renderer', () => {
         >
           <CellRendererWithPalette
             rowIndex={0}
+            colIndex={0}
             columnId="a"
             setCellProps={setCellProps}
             isExpandable={false}
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
index 67d95f04869f87..7d05e820598510 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
@@ -99,7 +99,7 @@ export const createGridColumns = (
                     data-test-subj="lensDatatableFilterFor"
                     onClick={() => {
                       handleFilterClick(field, rowValue, colIndex, rowIndex);
-                      closePopover();
+                      closePopover?.();
                     }}
                     iconType="plusInCircle"
                   >
@@ -137,7 +137,7 @@ export const createGridColumns = (
                     aria-label={filterOutAriaLabel}
                     onClick={() => {
                       handleFilterClick(field, rowValue, colIndex, rowIndex, true);
-                      closePopover();
+                      closePopover?.();
                     }}
                     iconType="minusInCircle"
                   >
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
index a77f43e68daef7..d78c03c98fb1b9 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
@@ -119,8 +119,8 @@ export const DataGrid: FC<Props> = memo(
         analysisType === ANALYSIS_CONFIG_TYPE.CLASSIFICATION ||
         analysisType === ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION
         ? {
-            featureImportance: ({ children }: { cellContentsElement: any; children: any }) => {
-              const rowIndex = children?.props?.visibleRowIndex;
+            featureImportance: ({ children }: { children: any }) => {
+              const rowIndex = children?.props?.rowIndex;
               const row = data[rowIndex];
               if (!row) return <div />;
               // if resultsField for some reason is not available then use ml
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
index 8da8e1f141bffd..babb60d4a80f00 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
@@ -67,6 +67,7 @@ function makeAlertsTableRow({ alertStatus }: AlertsTableRow) {
 
 const requiredProperties: CellValueElementProps = {
   rowIndex: 0,
+  colIndex: 0,
   columnId: '',
   setCellProps: jest.fn(),
   isExpandable: false,
diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
index b009c43bb3be01..0c1388bcfd6fd7 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
@@ -54,7 +54,7 @@ export const SUMMARY_VIEW = '[data-test-subj="summary-view"]';
 
 export const TABLE_CELL = '.euiTableRowCell';
 
-export const CELL_EXPAND_VALUE = '.euiDataGridRowCell__expandButtonIcon';
+export const CELL_EXPAND_VALUE = '[data-test-subj="euiDataGridCellExpandButton"]';
 
 export const CELL_EXPANSION_POPOVER = '[data-test-subj="euiDataGridExpansionPopover"]';
 
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
index a17cdf1a302a93..06fb89da85c0a0 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
@@ -48,6 +48,7 @@ describe('RenderCellValue', () => {
       isExpanded: false,
       linkValues,
       rowIndex,
+      colIndex: 0,
       setCellProps: jest.fn(),
       timelineId,
     };
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.tsx
index 443aeef5f4f81a..39ca4c207b230b 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.tsx
@@ -39,6 +39,7 @@ export const RenderCellValue: React.FC<
   isExpanded,
   linkValues,
   rowIndex,
+  colIndex,
   setCellProps,
   timelineId,
 }) => {
@@ -81,6 +82,7 @@ export const RenderCellValue: React.FC<
           isExpanded={isExpanded}
           linkValues={linkValues}
           rowIndex={rowIndex}
+          colIndex={colIndex}
           setCellProps={setCellProps}
           timelineId={timelineId}
         />
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
index f9dfc0625ac17d..2070a620183d65 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
@@ -46,6 +46,7 @@ describe('RenderCellValue', () => {
       isExpanded: false,
       linkValues,
       rowIndex,
+      colIndex: 0,
       setCellProps: jest.fn(),
       timelineId,
     };
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.tsx
index 3ee8b2fbee54df..7e8cd20724c0e9 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.tsx
@@ -36,6 +36,7 @@ export const RenderCellValue: React.FC<
   isExpanded,
   linkValues,
   rowIndex,
+  colIndex,
   setCellProps,
   timelineId,
 }) => {
@@ -75,6 +76,7 @@ export const RenderCellValue: React.FC<
           isExpanded={isExpanded}
           linkValues={linkValues}
           rowIndex={rowIndex}
+          colIndex={colIndex}
           setCellProps={setCellProps}
           timelineId={timelineId}
         />
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.test.tsx
index 6087553522eb88..f2e4ea342d0e5b 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.test.tsx
@@ -46,6 +46,7 @@ describe('RenderCellValue', () => {
       isExpanded: false,
       linkValues,
       rowIndex,
+      colIndex: 0,
       setCellProps: jest.fn(),
       timelineId,
     };
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx b/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx
index d5f7ed0ee2e1e6..4454653f6bc5ce 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx
@@ -32,6 +32,7 @@ export const RenderCellValue: React.FC<
   isExpanded,
   linkValues,
   rowIndex,
+  colIndex,
   rowRenderers,
   setCellProps,
   timelineId,
@@ -51,6 +52,7 @@ export const RenderCellValue: React.FC<
     isExpanded={isExpanded}
     linkValues={linkValues}
     rowIndex={rowIndex}
+    colIndex={colIndex}
     rowRenderers={rowRenderers}
     setCellProps={setCellProps}
     timelineId={timelineId}
diff --git a/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.test.tsx b/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.test.tsx
index 1a2e179175943e..4b684bc083d041 100644
--- a/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/effected_policy_select/effected_policy_select.test.tsx
@@ -55,7 +55,10 @@ describe('when using EffectedPolicySelect component', () => {
   describe('and no policy entries exist', () => {
     it('should display no options available message', () => {
       const { getByTestId } = render({ isGlobal: false });
-      expect(getByTestId('test-policiesSelectable').textContent).toEqual('No options available');
+      const euiSelectableMessageElement =
+        getByTestId('test-policiesSelectable').getElementsByClassName('euiSelectableMessage')[0];
+      expect(euiSelectableMessageElement).not.toBeNull();
+      expect(euiSelectableMessageElement.textContent).toEqual('No options available');
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
index 6ff820a6b7e628..b5d9f1fd2cecfc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
@@ -237,7 +237,10 @@ describe('Event filter form', () => {
     // move back to per-policy
     userEvent.click(component.getByTestId('perPolicy'));
     // the previous selected policy should be selected
-    expect(component.getByTestId(`policy-${policyId}`)).toHaveAttribute('aria-selected', 'true');
+    expect(component.getByTestId(`policy-${policyId}`)).toHaveAttribute(
+      'data-test-selected',
+      'true'
+    );
     // on change called with the previous policy
     expect(getState().form.entry?.tags).toEqual([`policy:${policyId}`]);
   });
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
index 81e34e538468d3..0d04ee83a56e52 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
@@ -144,7 +144,7 @@ describe('When on the host isolation exceptions entry form', () => {
       userEvent.click(renderResult.getByTestId('perPolicy'));
       // the previous selected policy should be selected
       expect(renderResult.getByTestId(`policy-${policyId}`)).toHaveAttribute(
-        'aria-selected',
+        'data-test-selected',
         'true'
       );
       // on change called with the previous policy
@@ -225,11 +225,11 @@ describe('When on the host isolation exceptions entry form', () => {
 
       expect(renderResult.queryByTestId('effectedPolicies-select-policiesSelectable')).toBeTruthy();
       expect(renderResult.getByTestId(`policy-${policyId1}`)).toHaveAttribute(
-        'aria-selected',
+        'data-test-selected',
         'true'
       );
       expect(renderResult.getByTestId(`policy-${policyId2}`)).toHaveAttribute(
-        'aria-selected',
+        'data-test-selected',
         'true'
       );
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
index f2313a4d0f7943..cc2c51c5f4c405 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
@@ -302,7 +302,7 @@ describe('When using the Trusted App Form', () => {
 
       expect(perPolicyButton.classList.contains('euiButtonGroupButton-isSelected')).toEqual(true);
       expect(renderResult.getByTestId('policy-123').getAttribute('aria-disabled')).toEqual('false');
-      expect(renderResult.getByTestId('policy-123').getAttribute('aria-selected')).toEqual('true');
+      expect(renderResult.getByTestId('policy-123').getAttribute('aria-checked')).toEqual('true');
     });
     it('should show loader when setting `policies.isLoading` to true and scope is per-policy', () => {
       formProps.policies.isLoading = true;
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
index ec36b048b51f01..d35afa9f4001ff 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
@@ -173,7 +173,7 @@ exports[`TrustedAppsGrid renders correctly when failed loading data for the seco
           class="euiSpacer euiSpacer--l"
         />
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
         >
           <div
             class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -4282,7 +4282,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
           class="euiSpacer euiSpacer--l"
         />
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
         >
           <div
             class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -8434,7 +8434,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
           class="euiSpacer euiSpacer--l"
         />
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
         >
           <div
             class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -12543,7 +12543,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
           class="euiSpacer euiSpacer--l"
         />
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow eui-xScroll"
         >
           <div
             class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
index a2638c7b8eb0b5..d9879cc2e12af0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
@@ -240,9 +240,10 @@ const TgridTdCell = ({
   tabType,
   timelineId,
 }: CellProps) => {
+  const ariaColIndex = index + ARIA_COLUMN_INDEX_OFFSET;
   return (
     <EventsTd
-      $ariaColumnIndex={index + ARIA_COLUMN_INDEX_OFFSET}
+      $ariaColumnIndex={ariaColIndex}
       key={tabType != null ? `${header.id}_${tabType}` : `${header.id}`}
       onKeyDown={onKeyDown}
       role="button"
@@ -252,10 +253,11 @@ const TgridTdCell = ({
       <EventsTdContent data-test-subj="cell-container">
         <>
           <EuiScreenReaderOnly data-test-subj="screenReaderOnly">
-            <p>{i18n.YOU_ARE_IN_A_TABLE_CELL({ row: ariaRowindex, column: index + 2 })}</p>
+            <p>{i18n.YOU_ARE_IN_A_TABLE_CELL({ row: ariaRowindex, column: ariaColIndex })}</p>
           </EuiScreenReaderOnly>
           <StatefulCell
-            ariaRowindex={ariaRowindex}
+            rowIndex={ariaRowindex - 1}
+            colIndex={ariaColIndex - 1}
             data={data}
             header={header}
             eventId={_id}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.test.tsx
index 6f9bcc61a96931..4afeb9d58c865d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.test.tsx
@@ -51,7 +51,8 @@ const RenderCellValue: React.FC<CellValueElementProps> = ({ columnId, data, setC
 };
 
 describe('StatefulCell', () => {
-  const ariaRowindex = 123;
+  const rowIndex = 123;
+  const colIndex = 0;
   const eventId = '_id-123';
   const linkValues = ['foo', 'bar', '@baz'];
   const tabType = TimelineTabs.query;
@@ -69,7 +70,8 @@ describe('StatefulCell', () => {
 
     mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
@@ -90,7 +92,8 @@ describe('StatefulCell', () => {
         isExpanded: false,
         isDetails: false,
         linkValues,
-        rowIndex: ariaRowindex - 1,
+        rowIndex,
+        colIndex,
         timelineId: `${timelineId}-${tabType}`,
       })
     );
@@ -101,7 +104,8 @@ describe('StatefulCell', () => {
 
     mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
@@ -121,7 +125,8 @@ describe('StatefulCell', () => {
         isExpanded: false,
         isDetails: false,
         linkValues,
-        rowIndex: ariaRowindex - 1,
+        rowIndex,
+        colIndex,
         timelineId,
       })
     );
@@ -132,7 +137,8 @@ describe('StatefulCell', () => {
 
     const wrapper = mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
@@ -148,7 +154,8 @@ describe('StatefulCell', () => {
   test("it renders a div with the styles set by `renderCellValue`'s `setCellProps` argument", () => {
     const wrapper = mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.tsx
index e7c03612828abf..c3e106f63501a0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/stateful_cell.tsx
@@ -21,7 +21,8 @@ export interface CommonProps {
 }
 
 const StatefulCellComponent = ({
-  ariaRowindex,
+  rowIndex,
+  colIndex,
   data,
   header,
   eventId,
@@ -30,7 +31,8 @@ const StatefulCellComponent = ({
   tabType,
   timelineId,
 }: {
-  ariaRowindex: number;
+  rowIndex: number;
+  colIndex: number;
   data: TimelineNonEcsData[];
   header: ColumnHeaderOptions;
   eventId: string;
@@ -53,7 +55,8 @@ const StatefulCellComponent = ({
         isDetails: false,
         isTimeline: true,
         linkValues,
-        rowIndex: ariaRowindex - 1,
+        rowIndex,
+        colIndex,
         setCellProps,
         timelineId: tabType != null ? `${timelineId}-${tabType}` : timelineId,
       })}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
index 30b4582096322f..9e74fa84a5adcf 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
@@ -34,6 +34,7 @@ describe('DefaultCellRenderer', () => {
   const isExpanded = true;
   const linkValues = ['foo', 'bar', '@baz'];
   const rowIndex = 3;
+  const colIndex = 0;
   const setCellProps = jest.fn();
   const timelineId = 'test';
   const ecsData = {} as Ecs;
@@ -66,6 +67,7 @@ describe('DefaultCellRenderer', () => {
               isExpanded={isExpanded}
               linkValues={linkValues}
               rowIndex={rowIndex}
+              colIndex={colIndex}
               setCellProps={setCellProps}
               timelineId={timelineId}
             />
@@ -100,6 +102,7 @@ describe('DefaultCellRenderer', () => {
               isExpanded={isExpanded}
               linkValues={linkValues}
               rowIndex={rowIndex}
+              colIndex={colIndex}
               setCellProps={setCellProps}
               timelineId={timelineId}
               truncate={truncate}
@@ -148,6 +151,7 @@ describe('DefaultCellRenderer', () => {
               isExpanded={isExpanded}
               linkValues={linkValues}
               rowIndex={rowIndex}
+              colIndex={colIndex}
               setCellProps={setCellProps}
               timelineId={timelineId}
             />
@@ -196,6 +200,7 @@ describe('host link rendering', () => {
               isTimeline={isTimeline}
               linkValues={[]}
               rowIndex={3}
+              colIndex={0}
               setCellProps={jest.fn()}
               timelineId={'timeline-1-query'}
             />
@@ -229,6 +234,7 @@ describe('host link rendering', () => {
               isTimeline={isTimeline}
               linkValues={[]}
               rowIndex={3}
+              colIndex={0}
               setCellProps={jest.fn()}
               timelineId={'timeline-1-query'}
             />
@@ -263,6 +269,7 @@ describe('host link rendering', () => {
               isTimeline={isTimeline}
               linkValues={[]}
               rowIndex={3}
+              colIndex={0}
               setCellProps={jest.fn()}
               timelineId={'timeline-1-query'}
             />
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/index.tsx
index 597968679bd959..935b1c2e1d4694 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/index.tsx
@@ -225,9 +225,10 @@ const TgridTdCell = ({
   tabType,
   timelineId,
 }: CellProps) => {
+  const ariaColIndex = index + ARIA_COLUMN_INDEX_OFFSET;
   return (
     <EventsTd
-      $ariaColumnIndex={index + ARIA_COLUMN_INDEX_OFFSET}
+      $ariaColumnIndex={ariaColIndex}
       key={tabType != null ? `${header.id}_${tabType}` : `${header.id}`}
       onKeyDown={onKeyDown}
       role="button"
@@ -237,10 +238,11 @@ const TgridTdCell = ({
       <EventsTdContent data-test-subj="cell-container">
         <>
           <EuiScreenReaderOnly data-test-subj="screenReaderOnly">
-            <p>{i18n.YOU_ARE_IN_A_TABLE_CELL({ row: ariaRowindex, column: index + 2 })}</p>
+            <p>{i18n.YOU_ARE_IN_A_TABLE_CELL({ row: ariaRowindex, column: ariaColIndex })}</p>
           </EuiScreenReaderOnly>
           <StatefulCell
-            ariaRowindex={ariaRowindex}
+            rowIndex={ariaRowindex - 1}
+            colIndex={ariaColIndex - 1}
             data={data}
             header={header}
             eventId={_id}
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.test.tsx
index 752e3018fc4049..d79a59422ff437 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.test.tsx
@@ -59,7 +59,8 @@ const RenderCellValue: React.FC<CellValueElementProps> = ({ columnId, data, setC
 };
 
 describe('StatefulCell', () => {
-  const ariaRowindex = 123;
+  const rowIndex = 123;
+  const colIndex = 0;
   const eventId = '_id-123';
   const linkValues = ['foo', 'bar', '@baz'];
   const tabType = TimelineTabs.query;
@@ -77,7 +78,8 @@ describe('StatefulCell', () => {
 
     mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
@@ -98,7 +100,8 @@ describe('StatefulCell', () => {
         isExpanded: false,
         isDetails: false,
         linkValues,
-        rowIndex: ariaRowindex - 1,
+        rowIndex,
+        colIndex,
         timelineId: `${timelineId}-${tabType}`,
       })
     );
@@ -109,7 +112,8 @@ describe('StatefulCell', () => {
 
     mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
@@ -129,7 +133,8 @@ describe('StatefulCell', () => {
         isExpanded: false,
         isDetails: false,
         linkValues,
-        rowIndex: ariaRowindex - 1,
+        rowIndex,
+        colIndex,
         timelineId,
       })
     );
@@ -140,7 +145,8 @@ describe('StatefulCell', () => {
 
     const wrapper = mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
@@ -156,7 +162,8 @@ describe('StatefulCell', () => {
   test("it renders a div with the styles set by `renderCellValue`'s `setCellProps` argument", () => {
     const wrapper = mount(
       <StatefulCell
-        ariaRowindex={ariaRowindex}
+        rowIndex={rowIndex}
+        colIndex={colIndex}
         data={data}
         header={header}
         eventId={eventId}
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.tsx
index e50fe80cd056cd..f66b4d88ba8761 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/data_driven_columns/stateful_cell.tsx
@@ -21,7 +21,8 @@ export interface CommonProps {
 }
 
 const StatefulCellComponent = ({
-  ariaRowindex,
+  rowIndex,
+  colIndex,
   data,
   header,
   eventId,
@@ -30,7 +31,8 @@ const StatefulCellComponent = ({
   tabType,
   timelineId,
 }: {
-  ariaRowindex: number;
+  rowIndex: number;
+  colIndex: number;
   data: TimelineNonEcsData[];
   header: ColumnHeaderOptions;
   eventId: string;
@@ -52,7 +54,8 @@ const StatefulCellComponent = ({
         isExpanded: false,
         isDetails: false,
         linkValues,
-        rowIndex: ariaRowindex - 1,
+        rowIndex,
+        colIndex,
         setCellProps,
         timelineId: tabType != null ? `${timelineId}-${tabType}` : timelineId,
       })}
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
index d2c8f22b1d3ac8..2ae0146f80f7e5 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -229,6 +229,7 @@ const transformControlColumns = ({
         isExpandable,
         isExpanded,
         rowIndex,
+        colIndex,
         setCellProps,
       }: EuiDataGridCellValueElementProps) => {
         const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
@@ -269,6 +270,7 @@ const transformControlColumns = ({
             onRowSelected={onRowSelected}
             onRuleChange={onRuleChange}
             rowIndex={rowIndex}
+            colIndex={colIndex}
             pageRowIndex={pageRowIndex}
             selectedEventIds={selectedEventIds}
             setCellProps={setCellProps}
@@ -729,6 +731,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
       const Cell: React.FC<EuiDataGridCellValueElementProps> = ({
         columnId,
         rowIndex,
+        colIndex,
         setCellProps,
         isDetails,
       }): React.ReactElement | null => {
@@ -767,6 +770,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
           isExpanded: false,
           linkValues: getOr([], header.linkField ?? '', ecs),
           rowIndex,
+          colIndex,
           rowRenderers,
           setCellProps,
           timelineId: id,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
index 178edc17c7c0ab..5bef7b368d9487 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
@@ -127,7 +127,7 @@ const EventRenderedViewComponent = ({
               {leadingControlColumns.length > 0
                 ? leadingControlColumns.map((action) => {
                     const getActions = action.rowCellRender as (
-                      props: EuiDataGridCellValueElementProps
+                      props: Omit<EuiDataGridCellValueElementProps, 'colIndex'>
                     ) => React.ReactNode;
                     return getActions({
                       columnId: 'actions',
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 881984cc719eb1..f730ce74257ac8 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1340,7 +1340,6 @@
     "core.euiDataGrid.ariaLabelledBy": "{page}/{pageCount}ページ。",
     "core.euiDataGrid.screenReaderNotice": "セルにはインタラクティブコンテンツが含まれます。",
     "core.euiDataGridCell.position": "行：{row}、列：{col}",
-    "core.euiDataGridCellButtons.expandButtonTitle": "クリックするか enter を押すと、セルのコンテンツとインタラクトできます。",
     "core.euiDataGridHeaderCell.headerActions": "ヘッダーアクション",
     "core.euiDataGridPagination.detailedPaginationLabel": "前のグリッドのページネーション：{label}",
     "core.euiDataGridPagination.paginationLabel": "前のグリッドのページネーション",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 197c982b01fd91..980d85be26e8f8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1363,7 +1363,6 @@
     "core.euiDataGrid.ariaLabelledBy": "第 {page} 页，共 {pageCount} 页。",
     "core.euiDataGrid.screenReaderNotice": "单元格包含交互内容。",
     "core.euiDataGridCell.position": "行：{row}；列：{col}",
-    "core.euiDataGridCellButtons.expandButtonTitle": "单击或按 Enter 键以便与单元格内容进行交互",
     "core.euiDataGridHeaderCell.headerActions": "标题操作",
     "core.euiDataGridPagination.detailedPaginationLabel": "前面网格的分页：{label}",
     "core.euiDataGridPagination.paginationLabel": "前面网格的分页",
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/deprecations_list.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/deprecations_list.test.ts
index c118eed5e26164..ca393e165e3357 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/deprecations_list.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/deprecations_list.test.ts
@@ -149,10 +149,10 @@ describe('ES deprecations table', () => {
 
       await actions.searchBar.clickTypeFilterDropdownAt(0);
 
-      // We need to read the document "body" as the filter dropdown options are added there and not inside
-      // the component DOM tree.
+      // We need to read the document "body" as the filter dropdown (an EuiSelectable)
+      // is added in a portalled popover and not inside the component DOM tree.
       const clusterTypeFilterButton: HTMLButtonElement | null = document.body.querySelector(
-        '.euiFilterSelect__items .euiFilterSelectItem'
+        '.euiSelectableList .euiSelectableListItem'
       );
 
       expect(clusterTypeFilterButton).not.toBeNull();
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
index 9f98496ac2edf5..dba077fc303d26 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
@@ -85,10 +85,11 @@ const createActions = (testBed: TestBed) => {
     },
 
     filterByConfigType: async () => {
-      // We need to read the document "body" as the filter dropdown options are added there and not inside
-      // the component DOM tree. The "Config" option is expected to be the first item.
+      // We need to read the document "body" as the filter dropdown (an EuiSelectable)
+      // is added in a portalled popover and not inside the component DOM tree.
+      // The "Config" option is expected to be the first item.
       const configTypeFilterButton: HTMLButtonElement | null = document.body.querySelector(
-        '.euiFilterSelect__items .euiFilterSelectItem'
+        '.euiSelectableList .euiSelectableListItem'
       );
 
       await act(async () => {
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
index cdc399a7507560..62e9622c176153 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
@@ -22,14 +22,14 @@ describe('FilterGroup', () => {
       values: [],
       loading: true,
     });
-    const { getByLabelText, getByText } = render(<FilterGroup />);
+    const { getByLabelText, getAllByText } = render(<FilterGroup />);
 
     await waitFor(() => {
       const popoverButton = getByLabelText(popoverButtonLabel);
       fireEvent.click(popoverButton);
     });
     await waitFor(() => {
-      expect(getByText('Loading options'));
+      expect(getAllByText('Loading options')).toHaveLength(2);
     });
   });
 
diff --git a/x-pack/test/functional/services/ml/stack_management_jobs.ts b/x-pack/test/functional/services/ml/stack_management_jobs.ts
index 27a89a3b340ce9..a7b6fa2f94617d 100644
--- a/x-pack/test/functional/services/ml/stack_management_jobs.ts
+++ b/x-pack/test/functional/services/ml/stack_management_jobs.ts
@@ -182,7 +182,7 @@ export function MachineLearningStackManagementJobsProvider(
     async isSpaceSelectionRowSelected(spaceId: string): Promise<boolean> {
       const state = await testSubjects.getAttribute(
         `sts-space-selector-row-${spaceId}`,
-        'aria-selected',
+        'data-test-selected',
         1000
       );
       return state === 'true';
diff --git a/yarn.lock b/yarn.lock
index 1bd5c8ceb2dd0e..827fe1a7eae40f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2013,7 +2013,7 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.0", "@babel/runtime@^7.16.0", "@babel/runtime@^7.17.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.0", "@babel/runtime@^7.16.0", "@babel/runtime@^7.17.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.17.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
   integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
@@ -2402,18 +2402,18 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@46.1.0":
-  version "46.1.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-46.1.0.tgz#b1d77a56d529001858b7fc91f6c2953288549336"
-  integrity sha512-j65NMzqKluVPtk3b6UYdVVaBha74Y8Y/N6QaHin9MmqUKoAPgevqHWvi0n/OmMpADdRCI0ldxkse6tgAvdaEHQ==
+"@elastic/eui@48.1.1":
+  version "48.1.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-48.1.1.tgz#38e440f7bfb30dc22220cb09e4bb36d0c500e495"
+  integrity sha512-9bz8D47f1xZJ8WsLBGCyeMk6JoJuyEyq5C46t5zsY0fayoeEX9FvpkUEdQWLb9zKJ14oNS3SD+ceao4bdu/IKQ==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"
     "@types/numeral" "^0.0.28"
-    "@types/react-beautiful-dnd" "^13.0.0"
-    "@types/react-input-autosize" "^2.2.0"
-    "@types/react-virtualized-auto-sizer" "^1.0.0"
-    "@types/react-window" "^1.8.2"
+    "@types/react-beautiful-dnd" "^13.1.2"
+    "@types/react-input-autosize" "^2.2.1"
+    "@types/react-virtualized-auto-sizer" "^1.0.1"
+    "@types/react-window" "^1.8.5"
     "@types/refractor" "^3.0.0"
     "@types/resize-observer-browser" "^0.1.5"
     "@types/vfile-message" "^2.0.0"
@@ -2423,13 +2423,14 @@
     mdast-util-to-hast "^10.0.0"
     numeral "^2.0.6"
     prop-types "^15.6.0"
-    react-beautiful-dnd "^13.0.0"
-    react-dropzone "^11.2.0"
-    react-focus-on "^3.5.0"
-    react-input-autosize "^2.2.2"
-    react-is "~16.3.0"
-    react-virtualized-auto-sizer "^1.0.2"
-    react-window "^1.8.5"
+    react-beautiful-dnd "^13.1.0"
+    react-dropzone "^11.5.3"
+    react-element-to-jsx-string "^14.3.4"
+    react-focus-on "^3.5.4"
+    react-input-autosize "^3.0.0"
+    react-is "^17.0.2"
+    react-virtualized-auto-sizer "^1.0.6"
+    react-window "^1.8.6"
     refractor "^3.5.0"
     rehype-raw "^5.0.0"
     rehype-react "^6.0.0"
@@ -2442,7 +2443,7 @@
     text-diff "^1.0.1"
     unified "^9.2.0"
     unist-util-visit "^2.0.3"
-    url-parse "^1.5.3"
+    url-parse "^1.5.6"
     uuid "^8.3.0"
     vfile "^4.2.0"
 
@@ -7384,6 +7385,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-beautiful-dnd@^13.1.2":
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.2.tgz#510405abb09f493afdfd898bf83995dc6385c130"
+  integrity sha512-+OvPkB8CdE/bGdXKyIhc/Lm2U7UAYCCJgsqmopFmh9gbAudmslkI8eOrPDjg4JhwSE6wytz4a3/wRjKtovHVJg==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-dom@>=16.9.0", "@types/react-dom@^16.9.8":
   version "16.9.8"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
@@ -7398,10 +7406,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-input-autosize@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@types/react-input-autosize/-/react-input-autosize-2.2.0.tgz#d62b07567088e547500f4693ae25dce0639c1b4e"
-  integrity sha512-8NO64XLmdRKUHeteXnweVnXuuSQr5HMSa4vRyNBUKOeZlimvgHPMtRchFHVHO9k7VpDoufCFYMJ6XHJ44qMTBQ==
+"@types/react-input-autosize@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@types/react-input-autosize/-/react-input-autosize-2.2.1.tgz#6a335212e7fce1e1a4da56ae2095c8c5c35fbfe6"
+  integrity sha512-RxzEjd4gbLAAdLQ92Q68/AC+TfsAKTc4evsArUH1aIShIMqQMIMjsxoSnwyjtbFTO/AGIW/RQI94XSdvOxCz/w==
   dependencies:
     "@types/react" "*"
 
@@ -7475,10 +7483,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-virtualized-auto-sizer@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.0.tgz#fc32f30a8dab527b5816f3a757e1e1d040c8f272"
-  integrity sha512-NMErdIdSnm2j/7IqMteRiRvRulpjoELnXWUwdbucYCz84xG9PHcoOrr7QfXwB/ku7wd6egiKFrzt/+QK4Imeeg==
+"@types/react-virtualized-auto-sizer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.1.tgz#b3187dae1dfc4c15880c9cfc5b45f2719ea6ebd4"
+  integrity sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong==
   dependencies:
     "@types/react" "*"
 
@@ -7497,10 +7505,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-window@^1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz#a5a6b2762ce73ffaab7911ee1397cf645f2459fe"
-  integrity sha512-gP1xam68Wc4ZTAee++zx6pTdDAH08rAkQrWm4B4F/y6hhmlT9Mgx2q8lTCXnrPHXsr15XjRN9+K2DLKcz44qEQ==
+"@types/react-window@^1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz#285fcc5cea703eef78d90f499e1457e9b5c02fc1"
+  integrity sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw==
   dependencies:
     "@types/react" "*"
 
@@ -8792,10 +8800,10 @@ argsplit@^1.0.5:
   resolved "https://registry.yarnpkg.com/argsplit/-/argsplit-1.0.5.tgz#9319a6ef63411716cfeb216c45ec1d13b35c5e99"
   integrity sha1-kxmm72NBFxbP6yFsRewdE7NcXpk=
 
-aria-hidden@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.1.1.tgz#0c356026d3f65e2bd487a3adb73f0c586be2c37e"
-  integrity sha512-M7zYxCcOQPOaxGHoMTKUFD2UNcVFTp9ycrdStLcTPLf8zgTXC3+YcGe+UuzSh5X1BX/0/PtS8xTNy4xyH/6xtw==
+aria-hidden@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.1.3.tgz#bb48de18dc84787a3c6eee113709c473c64ec254"
+  integrity sha512-RhVWFtKH5BiGMycI72q2RAFMLQi8JP9bLuQXgR5a8Znp7P5KOIADSJeyfI8PCVxLEp067B2HbP5JIiI/PXIZeA==
   dependencies:
     tslib "^1.0.0"
 
@@ -9203,10 +9211,10 @@ attr-accept@^1.1.3:
   dependencies:
     core-js "^2.5.0"
 
-attr-accept@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.1.tgz#89b48de019ed4342f1865626b4389c666b3ed231"
-  integrity sha512-GpefLMsbH5ojNgfTW+OBin2xKzuHfyeNA+qCktzZojBhbA/lPZdCFMWdwk5ajb989Ok7ZT+EADqvW3TAFNMjhA==
+attr-accept@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
+  integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==
 
 autoprefixer@^9.7.4:
   version "9.8.5"
@@ -13088,6 +13096,11 @@ detect-newline@3.1.0, detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
+detect-node-es@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
+  integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
+
 detect-node@2.1.0, detect-node@^2.0.4, detect-node@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -15109,12 +15122,12 @@ file-saver@^1.3.8:
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
-file-selector@^0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.12.tgz#fe726547be219a787a9dcc640575a04a032b1fd0"
-  integrity sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ==
+file-selector@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.4.0.tgz#59ec4f27aa5baf0841e9c6385c8386bef4d18b17"
+  integrity sha512-iACCiXeMYOvZqlF1kTiYINzgepRBymz1wwjiuup9u9nayhb6g4fSwiyJ/6adli+EPwrWtpgQAh2PoS7HukEGEg==
   dependencies:
-    tslib "^1.9.0"
+    tslib "^2.0.3"
 
 file-system-cache@^1.0.5:
   version "1.0.5"
@@ -15326,10 +15339,12 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-focus-lock@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a"
-  integrity sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw==
+focus-lock@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.9.2.tgz#9d30918aaa99b1b97677731053d017f82a540d5b"
+  integrity sha512-YtHxjX7a0IC0ZACL5wsX8QdncXofWpGPNoVMuI/nZUrPGp6LmNI6+D5j0pPj+v8Kw5EpweA+T5yImK0rnWf7oQ==
+  dependencies:
+    tslib "^2.0.3"
 
 folktale@2.0.1:
   version "2.0.1"
@@ -23851,6 +23866,15 @@ prop-types@15.x, prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.7, pr
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 propagate@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45"
@@ -24297,25 +24321,25 @@ react-ace@^7.0.5:
     lodash.isequal "^4.5.0"
     prop-types "^15.7.2"
 
-react-beautiful-dnd@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#f70cc8ff82b84bc718f8af157c9f95757a6c3b40"
-  integrity sha512-87It8sN0ineoC3nBW0SbQuTFXM6bUqM62uJGY4BtTf0yzPl8/3+bHMWkgIe0Z6m8e+gJgjWxefGRVfpE3VcdEg==
+react-beautiful-dnd@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d"
+  integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA==
   dependencies:
-    "@babel/runtime" "^7.8.4"
+    "@babel/runtime" "^7.9.2"
     css-box-model "^1.2.0"
     memoize-one "^5.1.1"
     raf-schd "^4.0.2"
-    react-redux "^7.1.1"
+    react-redux "^7.2.0"
     redux "^4.0.4"
     use-memo-one "^1.1.1"
 
-react-clientside-effect@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837"
-  integrity sha512-nRmoyxeok5PBO6ytPvSjKp9xwXg9xagoTK1mMjwnQxqM9Hd7MNPl+LS1bOSOe+CV2+4fnEquc7H/S8QD3q697A==
+react-clientside-effect@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.5.tgz#e2c4dc3c9ee109f642fac4f5b6e9bf5bcd2219a3"
+  integrity sha512-2bL8qFW1TGBHozGGbVeyvnggRpMjibeZM2536AKNENLECutp2yfs44IL8Hmpn8qjFQ2K7A9PnYf3vc7aQq/cPA==
   dependencies:
-    "@babel/runtime" "^7.0.0"
+    "@babel/runtime" "^7.12.13"
 
 react-color@^2.13.8:
   version "2.17.0"
@@ -24409,14 +24433,14 @@ react-draggable@^4.0.3, react-draggable@^4.4.3:
     clsx "^1.1.1"
     prop-types "^15.6.0"
 
-react-dropzone@^11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.2.0.tgz#4e54fa3479e6b6bb93f67914e4a27f1260807fdb"
-  integrity sha512-S/qaXQHCCg7MVlcrhqd05MLC6DupITLUB0CFn3iCLs6OTjzxdGDF1WTktTe5Jyq8jZdxYfMHNUZOHL0mg+K0Dw==
+react-dropzone@^11.5.3:
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.7.1.tgz#3851bb75b26af0bf1b17ce1449fd980e643b9356"
+  integrity sha512-zxCMwhfPy1olUEbw3FLNPLhAm/HnaYH5aELIEglRbqabizKAdHs0h+WuyOpmA+v1JXn0++fpQDdNfUagWt5hJQ==
   dependencies:
-    attr-accept "^2.0.0"
-    file-selector "^0.1.12"
-    prop-types "^15.7.2"
+    attr-accept "^2.2.2"
+    file-selector "^0.4.0"
+    prop-types "^15.8.1"
 
 react-dropzone@^4.2.9:
   version "4.3.0"
@@ -24426,7 +24450,7 @@ react-dropzone@^4.2.9:
     attr-accept "^1.1.3"
     prop-types "^15.5.7"
 
-react-element-to-jsx-string@^14.3.2:
+react-element-to-jsx-string@^14.3.2, react-element-to-jsx-string@^14.3.4:
   version "14.3.4"
   resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.4.tgz#709125bc72f06800b68f9f4db485f2c7d31218a8"
   integrity sha512-t4ZwvV6vwNxzujDQ+37bspnLwA4JlgUPWhLjBJWsNIDceAf6ZKUTCjdm08cN6WeZ5pTMKiCJkmAYnpmR4Bm+dg==
@@ -24457,29 +24481,30 @@ react-fast-compare@^3.0.1, react-fast-compare@^3.2.0:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
-react-focus-lock@^2.3.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.4.1.tgz#e842cc93da736b5c5d331799012544295cbcee4f"
-  integrity sha512-c5ZP56KSpj9EAxzScTqQO7bQQNPltf/W1ZEBDqNDOV1XOIwvAyHX0O7db9ekiAtxyKgnqZjQlLppVg94fUeL9w==
+react-focus-lock@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.6.0.tgz#97345c7abe439bf2974410b45529c2e208b1a633"
+  integrity sha512-2yB5KWyaefbvFDgqvsg/KpIjbqVlhIY2c/dyDcokDLhB3Ib7I4bjsrta5OkI5euUoIu5xBTyBwIQZPykUJAr1g==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.7.0"
+    focus-lock "^0.9.2"
     prop-types "^15.6.2"
-    react-clientside-effect "^1.2.2"
-    use-callback-ref "^1.2.1"
-    use-sidecar "^1.0.1"
+    react-clientside-effect "^1.2.5"
+    use-callback-ref "^1.2.5"
+    use-sidecar "^1.0.5"
 
-react-focus-on@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.5.0.tgz#3cdebbefee26a083976e1700ba75f7377040f7f1"
-  integrity sha512-RqGAHOxhRAaMSVHIN5IpY7YL6AJkD/DMa/+iPDV7aB6XWRQfg3v2q35egIZgMWP2xhXaRVai3B80dpVWyj4Rcw==
+react-focus-on@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.5.4.tgz#be45a9d0495f3bb6f5249704c85362df94980ecf"
+  integrity sha512-HnU0YGKhNSUsC4k6K8L+2wk8mC/qdg+CsS7A1bWLMgK7UuBphdECs2esnS6cLmBoVNjsFnCm/vMypeezKOdK3A==
   dependencies:
-    aria-hidden "^1.1.1"
-    react-focus-lock "^2.3.1"
-    react-remove-scroll "^2.4.0"
-    react-style-singleton "^2.1.0"
-    use-callback-ref "^1.2.3"
-    use-sidecar "^1.0.1"
+    aria-hidden "^1.1.3"
+    react-focus-lock "^2.6.0"
+    react-remove-scroll "^2.4.1"
+    react-style-singleton "^2.1.1"
+    tslib "^2.3.1"
+    use-callback-ref "^1.2.5"
+    use-sidecar "^1.0.5"
 
 react-grid-layout@^0.16.2:
   version "0.16.6"
@@ -24503,7 +24528,7 @@ react-helmet-async@^1.0.7:
     react-fast-compare "^3.2.0"
     shallowequal "^1.1.0"
 
-react-input-autosize@^2.2.1, react-input-autosize@^2.2.2:
+react-input-autosize@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"
   integrity sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==
@@ -24537,7 +24562,7 @@ react-intl@^2.8.0:
     intl-relativeformat "^2.1.0"
     invariant "^2.1.1"
 
-react-is@17.0.2:
+react-is@17.0.2, react-is@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -24552,11 +24577,6 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
   integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
 
-react-is@~16.3.0:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
-  integrity sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q==
-
 react-lib-adler32@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/react-lib-adler32/-/react-lib-adler32-1.0.3.tgz#63df1aed274eabcc1c5067077ea281ec30888ba7"
@@ -24653,7 +24673,7 @@ react-query@^3.34.0:
     broadcast-channel "^3.4.1"
     match-sorter "^6.0.2"
 
-react-redux@^7.1.0, react-redux@^7.1.1, react-redux@^7.2.0:
+react-redux@^7.1.0, react-redux@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
   integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==
@@ -24677,10 +24697,10 @@ react-remove-scroll-bar@^2.1.0:
     react-style-singleton "^2.1.0"
     tslib "^1.0.0"
 
-react-remove-scroll@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.0.tgz#190c16eb508c5927595935499e8f5dd9ab0e75cf"
-  integrity sha512-BZIO3GaEs0Or1OhA5C//n1ibUP1HdjJmqUVUsOCMxwoIpaCocbB9TFKwHOkBa/nyYy3slirqXeiPYGwdSDiseA==
+react-remove-scroll@^2.4.1:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.3.tgz#83d19b02503b04bd8141ed6e0b9e6691a2e935a6"
+  integrity sha512-lGWYXfV6jykJwbFpsuPdexKKzp96f3RbvGapDSIdcyGvHb7/eqyn46C7/6h+rUzYar1j5mdU+XECITHXCKBk9Q==
   dependencies:
     react-remove-scroll-bar "^2.1.0"
     react-style-singleton "^2.1.0"
@@ -24828,6 +24848,15 @@ react-style-singleton@^2.1.0:
     invariant "^2.2.4"
     tslib "^1.0.0"
 
+react-style-singleton@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.1.1.tgz#ce7f90b67618be2b6b94902a30aaea152ce52e66"
+  integrity sha512-jNRp07Jza6CBqdRKNgGhT3u9umWvils1xsuMOjZlghBDH2MU0PL2WZor4PGYjXpnRCa9DQSlHMs/xnABWOwYbA==
+  dependencies:
+    get-nonce "^1.0.0"
+    invariant "^2.2.4"
+    tslib "^1.0.0"
+
 react-syntax-highlighter@^13.5.3, react-syntax-highlighter@^15.3.1:
   version "15.3.1"
   resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.3.1.tgz#ba16ae8705f191956b73d0e11ae938fd255f2579"
@@ -24910,10 +24939,10 @@ react-use@^15.3.8:
     ts-easing "^0.2.0"
     tslib "^2.0.0"
 
-react-virtualized-auto-sizer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.2.tgz#a61dd4f756458bbf63bd895a92379f9b70f803bd"
-  integrity sha512-MYXhTY1BZpdJFjUovvYHVBmkq79szK/k7V3MO+36gJkWGkrXKtyr4vCPtpphaTLRAdDNoYEYFZWE8LjN+PIHNg==
+react-virtualized-auto-sizer@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca"
+  integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==
 
 react-virtualized@^9.21.2:
   version "9.21.2"
@@ -24956,10 +24985,10 @@ react-visibility-sensor@^5.1.1:
   dependencies:
     prop-types "^15.7.2"
 
-react-window@^1.8.5:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1"
-  integrity sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q==
+react-window@^1.8.6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112"
+  integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==
   dependencies:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
@@ -28820,7 +28849,7 @@ tsd@^0.13.1:
     read-pkg-up "^7.0.0"
     update-notifier "^4.1.0"
 
-tslib@2.3.1, tslib@^2.1.0, tslib@^2.3.0, tslib@~2.3.1:
+tslib@2.3.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@~2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -29556,7 +29585,7 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3, url-parse@^1.5.3:
+url-parse@^1.4.3:
   version "1.5.9"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.9.tgz#05ff26484a0b5e4040ac64dcee4177223d74675e"
   integrity sha512-HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==
@@ -29564,6 +29593,14 @@ url-parse@^1.4.3, url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url-parse@^1.5.6:
+  version "1.5.6"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.6.tgz#b2a41d5a233645f3c31204cc8be60e76a15230a2"
+  integrity sha512-xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
@@ -29577,11 +29614,16 @@ url@^0.11.0, url@~0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-callback-ref@^1.2.1, use-callback-ref@^1.2.3:
+use-callback-ref@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.4.tgz#d86d1577bfd0b955b6e04aaf5971025f406bea3c"
   integrity sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ==
 
+use-callback-ref@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5"
+  integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==
+
 use-composed-ref@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz#bb13e8f4a0b873632cde4940abeb88b92d03023a"
@@ -29621,6 +29663,14 @@ use-sidecar@^1.0.1:
     detect-node "^2.0.4"
     tslib "^1.9.3"
 
+use-sidecar@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.5.tgz#ffff2a17c1df42e348624b699ba6e5c220527f2b"
+  integrity sha512-k9jnrjYNwN6xYLj1iaGhonDghfvmeTmYjAiGvOr7clwKfPjMXJf4/HOr7oT5tJwYafgp2tG2l3eZEOfoELiMcA==
+  dependencies:
+    detect-node-es "^1.1.0"
+    tslib "^1.9.3"
+
 use@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"