diff --git a/packages/core/saved-objects/core-saved-objects-server/docs/model_versions.md b/packages/core/saved-objects/core-saved-objects-server/docs/model_versions.md
index 6e0e0a388c331..8241b361ba872 100644
--- a/packages/core/saved-objects/core-saved-objects-server/docs/model_versions.md
+++ b/packages/core/saved-objects/core-saved-objects-server/docs/model_versions.md
@@ -893,9 +893,11 @@ to the `fields` option **were already present in the prior model version**. Othe
 during upgrades, where newly introduced or backfilled fields may not necessarily appear in the documents returned
 from the `search` API when the option is used.
 
-### Using `update` with dynamically backfilled fields
+### Using `bulkUpdate` with dynamically backfilled fields
 
-The savedObjects `update` API is effectively a partial update (using Elasticsearch's `_update` under the hood),
+(Note: this same limitation used to exist for the `update` method but has been [fixed](https://github.com/elastic/kibana/issues/165434). So while they're similar this limitation is only relevant for the `bulkUpdate` method)
+
+The savedObjects `bulkUpdate` API is effectively a partial update (using Elasticsearch's `_update` under the hood),
 allowing API consumers to only specify the subset of fields they want to update to new values, without having to
 provide the full list of attributes (the unchanged ones). We're also not changing the `version` of the document
 during updates, even when the instance performing the operation doesn't know about the current model version
@@ -935,8 +937,14 @@ const newDocAttributes = {
 Which could occur either while being still in the cohabitation period, or in case of rollback:
 
 ```ts
-savedObjectClient.update('type', 'id', {
-  index: 11,
+savedObjectClient.bulkUpdate({
+  objects: [{
+    type: 'type', 
+    id: 'id', 
+    attributes: {
+      index: 11
+    }
+  }]
 });
 ```
 
@@ -949,7 +957,7 @@ We will then be in a situation where our data is **inconsistent**, as the value
 }
 ```
 
-The long term solution for that is implementing [backward-compatible updates](https://github.com/elastic/kibana/issues/152807), however
+The long term solution for that is implementing [backward-compatible updates](https://github.com/elastic/kibana/issues/165434), however
 this won't be done for the MVP, so the workaround for now is to avoid situations where this edge case can occur.
 
 It can be avoided by either:
diff --git a/test/functional/apps/console/_autocomplete.ts b/test/functional/apps/console/_autocomplete.ts
index 54e35bff86ee9..dd2e5a131efea 100644
--- a/test/functional/apps/console/_autocomplete.ts
+++ b/test/functional/apps/console/_autocomplete.ts
@@ -217,6 +217,7 @@ GET _search
         for (const keyPress of keyPresses) {
           await PageObjects.console.sleepForDebouncePeriod();
           log.debug('Key', keyPress);
+          // @ts-ignore
           await PageObjects.console[keyPress]();
           expect(await PageObjects.console.isAutocompleteVisible()).to.be.eql(false);
         }
@@ -257,7 +258,7 @@ GET _search
           for (const char of [method.at(-1), ' ', '_']) {
             await PageObjects.console.sleepForDebouncePeriod();
             log.debug('Key type "%s"', char);
-            await PageObjects.console.enterText(char); // e.g. 'Post ' -> 'Post _'
+            await PageObjects.console.enterText(char ?? ''); // e.g. 'Post ' -> 'Post _'
           }
 
           await retry.waitFor('autocomplete to be visible', () =>
diff --git a/test/functional/apps/dashboard_elements/controls/common/replace_controls.ts b/test/functional/apps/dashboard_elements/controls/common/replace_controls.ts
index 5c065f7f000f5..d3019a34b8802 100644
--- a/test/functional/apps/dashboard_elements/controls/common/replace_controls.ts
+++ b/test/functional/apps/dashboard_elements/controls/common/replace_controls.ts
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const security = getService('security');
 
-  const { dashboardControls, timePicker, common, dashboard } = getPageObjects([
+  const { dashboardControls, timePicker, dashboard } = getPageObjects([
     'dashboardControls',
     'timePicker',
     'dashboard',
diff --git a/test/functional/apps/visualize/group2/_inspector.ts b/test/functional/apps/visualize/group2/_inspector.ts
index 9baa3b1bc820d..077a37a90c06c 100644
--- a/test/functional/apps/visualize/group2/_inspector.ts
+++ b/test/functional/apps/visualize/group2/_inspector.ts
@@ -14,7 +14,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');
   const inspector = getService('inspector');
   const filterBar = getService('filterBar');
-  const monacoEditor = getService('monacoEditor');
   const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('inspector', function describeIndexTests() {
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
index 73c53dd5fda91..c797550c1617a 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
@@ -90,7 +90,7 @@ function TemplateWithContext({
   const {
     path: { serviceName },
     query,
-    query: { rangeFrom, rangeTo },
+    query: { rangeFrom, rangeTo, environment },
   } = useApmParams('/services/{serviceName}/*');
   const history = useHistory();
   const location = useLocation();
@@ -140,6 +140,7 @@ function TemplateWithContext({
                 <EuiFlexItem grow={false}>
                   <ServiceIcons
                     serviceName={serviceName}
+                    environment={environment}
                     start={start}
                     end={end}
                   />
diff --git a/x-pack/plugins/apm/public/components/routing/templates/mobile_service_template/index.tsx b/x-pack/plugins/apm/public/components/routing/templates/mobile_service_template/index.tsx
index 496010a14853a..cc841b200a5b5 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/mobile_service_template/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/mobile_service_template/index.tsx
@@ -57,7 +57,7 @@ function TemplateWithContext({
   const {
     path: { serviceName },
     query,
-    query: { rangeFrom, rangeTo },
+    query: { rangeFrom, rangeTo, environment },
   } = useApmParams('/mobile-services/{serviceName}/*');
 
   const { start, end } = useTimeRange({ rangeFrom, rangeTo });
@@ -116,6 +116,7 @@ function TemplateWithContext({
                 <EuiFlexItem grow={false}>
                   <ServiceIcons
                     serviceName={serviceName}
+                    environment={environment}
                     start={start}
                     end={end}
                   />
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
index 5ac5f6326c8c9..cec958da0eb70 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
@@ -64,6 +64,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -87,6 +88,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -112,6 +114,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -138,6 +141,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -165,6 +169,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -212,6 +217,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -256,6 +262,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -308,6 +315,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
@@ -366,6 +374,7 @@ describe('ServiceIcons', () => {
           <EuiThemeProvider>
             <ServiceIcons
               serviceName="foo"
+              environment="dev"
               start="2021-08-20T10:00:00.000Z"
               end="2021-08-20T10:15:00.000Z"
             />
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx
index f5a647d3ca488..a77c6b9c7c604 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx
@@ -25,6 +25,7 @@ import openTelemetryIcon from '../agent_icon/icons/opentelemetry.svg';
 
 interface Props {
   serviceName: string;
+  environment: string;
   start: string;
   end: string;
 }
@@ -92,7 +93,7 @@ export interface PopoverItem {
   component: ReactChild;
 }
 
-export function ServiceIcons({ start, end, serviceName }: Props) {
+export function ServiceIcons({ start, end, serviceName, environment }: Props) {
   const [selectedIconPopover, setSelectedIconPopover] =
     useState<Icons | null>();
 
@@ -117,20 +118,20 @@ export function ServiceIcons({ start, end, serviceName }: Props) {
 
   const { data: details, status: detailsFetchStatus } = useFetcher(
     (callApmApi) => {
-      if (selectedIconPopover && serviceName && start && end) {
+      if (selectedIconPopover && serviceName && start && end && environment) {
         return callApmApi(
           'GET /internal/apm/services/{serviceName}/metadata/details',
           {
             isCachable: true,
             params: {
               path: { serviceName },
-              query: { start, end },
+              query: { start, end, environment },
             },
           }
         );
       }
     },
-    [selectedIconPopover, serviceName, start, end]
+    [selectedIconPopover, serviceName, start, end, environment]
   );
 
   const isLoading = !icons && iconsFetchStatus === FETCH_STATUS.LOADING;
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
index d5ea675338856..6a0fc2753d03e 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
@@ -22,6 +22,7 @@ type ServiceIconsReturnType =
 
 interface Args {
   serviceName: string;
+  environment: string;
   start: string;
   end: string;
   icons: ServiceIconsReturnType;
@@ -64,7 +65,12 @@ const stories: Meta<Args> = {
 };
 export default stories;
 
-export const Example: Story<Args> = ({ serviceName, start, end }) => {
+export const Example: Story<Args> = ({
+  serviceName,
+  environment,
+  start,
+  end,
+}) => {
   return (
     <EuiFlexGroup>
       <EuiFlexItem>
@@ -83,6 +89,7 @@ export const Example: Story<Args> = ({ serviceName, start, end }) => {
                   <EuiFlexItem grow={false}>
                     <ServiceIcons
                       serviceName={serviceName}
+                      environment={environment}
                       start={start}
                       end={end}
                     />
@@ -98,6 +105,7 @@ export const Example: Story<Args> = ({ serviceName, start, end }) => {
 };
 Example.args = {
   serviceName: 'opbeans-java',
+  environment: 'dev',
   start: '2021-09-10T13:59:00.000Z',
   end: '2021-09-10T14:14:04.789Z',
   icons: {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts b/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
index 2231caa7df71e..4dd26b007ce57 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
@@ -7,6 +7,7 @@
 
 import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';
+import { environmentQuery } from '../../../common/utils/environment_query';
 import {
   AGENT,
   CONTAINER,
@@ -86,17 +87,20 @@ export interface ServiceMetadataDetails {
 
 export async function getServiceMetadataDetails({
   serviceName,
+  environment,
   apmEventClient,
   start,
   end,
 }: {
   serviceName: string;
+  environment: string;
   apmEventClient: APMEventClient;
   start: number;
   end: number;
 }): Promise<ServiceMetadataDetails> {
   const filter = [
     { term: { [SERVICE_NAME]: serviceName } },
+    ...environmentQuery(environment),
     ...rangeQuery(start, end),
   ];
 
diff --git a/x-pack/plugins/apm/server/routes/services/route.ts b/x-pack/plugins/apm/server/routes/services/route.ts
index 970a72d478f72..52c04271bf31a 100644
--- a/x-pack/plugins/apm/server/routes/services/route.ts
+++ b/x-pack/plugins/apm/server/routes/services/route.ts
@@ -234,17 +234,18 @@ const serviceMetadataDetailsRoute = createApmServerRoute({
   endpoint: 'GET /internal/apm/services/{serviceName}/metadata/details',
   params: t.type({
     path: t.type({ serviceName: t.string }),
-    query: rangeRt,
+    query: t.intersection([rangeRt, environmentRt]),
   }),
   options: { tags: ['access:apm'] },
   handler: async (resources): Promise<ServiceMetadataDetails> => {
     const apmEventClient = await getApmEventClient(resources);
     const { params } = resources;
     const { serviceName } = params.path;
-    const { start, end } = params.query;
+    const { start, end, environment } = params.query;
 
     const serviceMetadataDetails = await getServiceMetadataDetails({
       serviceName,
+      environment,
       apmEventClient,
       start,
       end,
diff --git a/x-pack/plugins/event_log/README.md b/x-pack/plugins/event_log/README.md
index 35d80d2a2f7c3..ae2117fcd8ad4 100644
--- a/x-pack/plugins/event_log/README.md
+++ b/x-pack/plugins/event_log/README.md
@@ -44,7 +44,7 @@ prior releases, it was an alias with an initial index set up, with the
 alias used to deal with rolled over indices from ILM.  With the data stream,
 there's a little less set up, and the bulk writing is slightly different.
 
-The default data stream / alias name is `.kibana-event-log-${kibanaVersion}`.
+The default data stream / alias name is `.kibana-event-log-ds`.
 To search across all versions' event logs, use `.kibana-event-log-*`; 
 it will search over data streams and aliases as expected.
 
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index e51108c6e701d..a147d80f6639d 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -35,7 +35,7 @@ beforeEach(() => {
   clusterClientAdapter = new ClusterClientAdapter({
     logger,
     elasticsearchClientPromise: Promise.resolve(clusterClient),
-    esNames: getEsNames('kibana', '1.2.3'),
+    esNames: getEsNames('kibana'),
     wait: () => Promise.resolve(true),
   });
 });
@@ -50,7 +50,7 @@ describe('indexDocument', () => {
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
       body: [{ create: {} }, { message: 'foo' }],
-      index: 'kibana-event-log-1.2.3',
+      index: 'kibana-event-log-ds',
     });
   });
 
@@ -103,7 +103,7 @@ describe('buffering documents', () => {
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
       body: expectedBody,
-      index: 'kibana-event-log-1.2.3',
+      index: 'kibana-event-log-ds',
     });
   });
 
@@ -124,12 +124,12 @@ describe('buffering documents', () => {
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(1, {
       body: expectedBody,
-      index: 'kibana-event-log-1.2.3',
+      index: 'kibana-event-log-ds',
     });
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(2, {
       body: [{ create: {} }, { message: `foo 100` }],
-      index: 'kibana-event-log-1.2.3',
+      index: 'kibana-event-log-ds',
     });
   });
 
@@ -158,7 +158,7 @@ describe('buffering documents', () => {
       }
 
       expect(clusterClient.bulk).toHaveBeenNthCalledWith(i + 1, {
-        index: 'kibana-event-log-1.2.3',
+        index: 'kibana-event-log-ds',
         body: expectedBody,
       });
     }
diff --git a/x-pack/plugins/event_log/server/es/context.test.ts b/x-pack/plugins/event_log/server/es/context.test.ts
index 5cb6887af3c9b..19789e0e8dc3c 100644
--- a/x-pack/plugins/event_log/server/es/context.test.ts
+++ b/x-pack/plugins/event_log/server/es/context.test.ts
@@ -36,7 +36,6 @@ describe('createEsContext', () => {
       logger,
       shouldSetExistingAssetsToHidden: true,
       indexNameRoot: 'test0',
-      kibanaVersion: '1.2.3',
       elasticsearchClientPromise: Promise.resolve(elasticsearchClient),
     });
 
@@ -51,16 +50,15 @@ describe('createEsContext', () => {
       logger,
       shouldSetExistingAssetsToHidden: true,
       indexNameRoot: 'test-index',
-      kibanaVersion: '1.2.3',
       elasticsearchClientPromise: Promise.resolve(elasticsearchClient),
     });
 
     const esNames = context.esNames;
     expect(esNames).toStrictEqual({
       base: 'test-index',
-      dataStream: 'test-index-event-log-1.2.3',
+      dataStream: 'test-index-event-log-ds',
       indexPattern: 'test-index-event-log-*',
-      indexTemplate: 'test-index-event-log-1.2.3-template',
+      indexTemplate: 'test-index-event-log-template',
     });
   });
 
@@ -69,7 +67,6 @@ describe('createEsContext', () => {
       logger,
       shouldSetExistingAssetsToHidden: true,
       indexNameRoot: 'test1',
-      kibanaVersion: '1.2.3',
       elasticsearchClientPromise: Promise.resolve(elasticsearchClient),
     });
 
@@ -91,7 +88,6 @@ describe('createEsContext', () => {
       logger,
       shouldSetExistingAssetsToHidden: true,
       indexNameRoot: 'test2',
-      kibanaVersion: '1.2.3',
       elasticsearchClientPromise: Promise.resolve(elasticsearchClient),
     });
     elasticsearchClient.indices.existsTemplate.mockResponse(true);
@@ -123,7 +119,6 @@ describe('createEsContext', () => {
       logger,
       shouldSetExistingAssetsToHidden: true,
       indexNameRoot: 'test2',
-      kibanaVersion: '1.2.3',
       elasticsearchClientPromise: Promise.resolve(elasticsearchClient),
     });
     expect(mockCreateReadySignal).toBeCalledTimes(1);
@@ -141,7 +136,6 @@ describe('createEsContext', () => {
       logger,
       shouldSetExistingAssetsToHidden: true,
       indexNameRoot: 'test2',
-      kibanaVersion: '1.2.3',
       elasticsearchClientPromise: Promise.resolve(elasticsearchClient),
     });
     context.initialize();
diff --git a/x-pack/plugins/event_log/server/es/context.ts b/x-pack/plugins/event_log/server/es/context.ts
index 25d978416e354..7b0936ddf38e5 100644
--- a/x-pack/plugins/event_log/server/es/context.ts
+++ b/x-pack/plugins/event_log/server/es/context.ts
@@ -38,7 +38,6 @@ export function createEsContext(params: EsContextCtorParams): EsContext {
 export interface EsContextCtorParams {
   logger: Logger;
   indexNameRoot: string;
-  kibanaVersion: string;
   shouldSetExistingAssetsToHidden: boolean;
   elasticsearchClientPromise: Promise<ElasticsearchClient>;
 }
@@ -54,7 +53,7 @@ class EsContextImpl implements EsContext {
 
   constructor(params: EsContextCtorParams) {
     this.logger = params.logger;
-    this.esNames = getEsNames(params.indexNameRoot, params.kibanaVersion);
+    this.esNames = getEsNames(params.indexNameRoot);
     this.readySignal = createReadySignal();
     this.initialized = false;
     this.retryDelay = RETRY_DELAY;
diff --git a/x-pack/plugins/event_log/server/es/documents.test.ts b/x-pack/plugins/event_log/server/es/documents.test.ts
index 71b75ee3ca3dc..ec79372420314 100644
--- a/x-pack/plugins/event_log/server/es/documents.test.ts
+++ b/x-pack/plugins/event_log/server/es/documents.test.ts
@@ -9,8 +9,7 @@ import { getIndexTemplate } from './documents';
 import { getEsNames } from './names';
 
 describe('getIndexTemplate()', () => {
-  const kibanaVersion = '1.2.3';
-  const esNames = getEsNames('XYZ', kibanaVersion);
+  const esNames = getEsNames('XYZ');
 
   test('returns the correct details of the index template', () => {
     const indexTemplate = getIndexTemplate(esNames);
diff --git a/x-pack/plugins/event_log/server/es/names.test.ts b/x-pack/plugins/event_log/server/es/names.test.ts
index 63d1ad9d398a7..a01fa5961e5ce 100644
--- a/x-pack/plugins/event_log/server/es/names.test.ts
+++ b/x-pack/plugins/event_log/server/es/names.test.ts
@@ -14,11 +14,10 @@ jest.mock('../../../../package.json', () => ({
 describe('getEsNames()', () => {
   test('works as expected', () => {
     const base = 'XYZ';
-    const kibanaVersion = '1.2.3';
-    const esNames = getEsNames(base, kibanaVersion);
+    const esNames = getEsNames(base);
     expect(esNames.base).toEqual(base);
-    expect(esNames.dataStream).toEqual(`${base}-event-log-${kibanaVersion}`);
+    expect(esNames.dataStream).toEqual(`${base}-event-log-ds`);
     expect(esNames.indexPattern).toEqual(`${base}-event-log-*`);
-    expect(esNames.indexTemplate).toEqual(`${base}-event-log-${kibanaVersion}-template`);
+    expect(esNames.indexTemplate).toEqual(`${base}-event-log-template`);
   });
 });
diff --git a/x-pack/plugins/event_log/server/es/names.ts b/x-pack/plugins/event_log/server/es/names.ts
index 0e48ca911b95a..412bf0824244b 100644
--- a/x-pack/plugins/event_log/server/es/names.ts
+++ b/x-pack/plugins/event_log/server/es/names.ts
@@ -14,14 +14,12 @@ export interface EsNames {
   indexTemplate: string;
 }
 
-export function getEsNames(baseName: string, kibanaVersion: string): EsNames {
-  const EVENT_LOG_VERSION_SUFFIX = `-${kibanaVersion.toLocaleLowerCase()}`;
+export function getEsNames(baseName: string): EsNames {
   const eventLogName = `${baseName}${EVENT_LOG_NAME_SUFFIX}`;
-  const eventLogNameWithVersion = `${eventLogName}${EVENT_LOG_VERSION_SUFFIX}`;
   return {
     base: baseName,
-    dataStream: eventLogNameWithVersion,
+    dataStream: `${eventLogName}-ds`,
     indexPattern: `${eventLogName}-*`,
-    indexTemplate: `${eventLogNameWithVersion}-template`,
+    indexTemplate: `${eventLogName}-template`,
   };
 }
diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
index 7bd9291ab4091..4b0dcbece34b4 100644
--- a/x-pack/plugins/event_log/server/plugin.ts
+++ b/x-pack/plugins/event_log/server/plugin.ts
@@ -71,7 +71,6 @@ export class Plugin implements CorePlugin<IEventLogService, IEventLogClientServi
       elasticsearchClientPromise: core
         .getStartServices()
         .then(([{ elasticsearch }]) => elasticsearch.client.asInternalUser),
-      kibanaVersion: this.kibanaVersion,
       // Only non-serverless deployments may have assets that need to be converted
       shouldSetExistingAssetsToHidden: !plugins.serverless,
     });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.test.tsx
new file mode 100644
index 0000000000000..07f42b65fdb0c
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.test.tsx
@@ -0,0 +1,100 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+
+import { AgentsSelectionStatus } from './agents_selection_status';
+
+function render(props: any) {
+  const renderer = createFleetTestRendererMock();
+
+  return renderer.render(<AgentsSelectionStatus {...props} />);
+}
+
+const defaultProps = {
+  totalAgents: 30,
+  selectableAgents: 20,
+  managedAgentsOnCurrentPage: 0,
+  selectionMode: 'manual',
+  setSelectionMode: jest.fn(),
+  selectedAgents: [],
+  setSelectedAgents: jest.fn(),
+};
+
+function generateAgents(n: number) {
+  return [...Array(n).keys()].map((i) => ({
+    id: `agent${i}`,
+    active: true,
+  }));
+}
+
+describe('AgentsSelectionStatus', () => {
+  describe('when selection mode is manual', () => {
+    describe('when there are no selected agents', () => {
+      it('should not show any selection options', () => {
+        const res = render(defaultProps);
+        expect(res.queryByTestId('selectedAgentCountLabel')).toBeNull();
+        expect(res.queryByTestId('clearAgentSelectionButton')).toBeNull();
+        expect(res.queryByTestId('selectedEverythingOnAllPagesButton')).toBeNull();
+      });
+    });
+
+    describe('when there are selected agents', () => {
+      it('should show the number of selected agents and the Clear selection button', () => {
+        const res = render({ ...defaultProps, selectedAgents: generateAgents(2) });
+        expect(res.queryByTestId('selectedAgentCountLabel')).not.toBeNull();
+        expect(res.queryByTestId('clearAgentSelectionButton')).not.toBeNull();
+      });
+
+      it('should not show the Select everything on all pages button if not all agents are selected', () => {
+        const res = render({ ...defaultProps, selectedAgents: generateAgents(2) });
+        expect(res.queryByTestId('selectedEverythingOnAllPagesButton')).toBeNull();
+      });
+
+      it('should not show the Select everything on all pages button if all agents are selected but there are no more selectable agents', () => {
+        const res = render({
+          ...defaultProps,
+          totalAgents: 20,
+          selectableAgents: 19,
+          managedAgentsOnCurrentPage: 1,
+          selectedAgents: generateAgents(19),
+        });
+        expect(res.queryByTestId('selectedEverythingOnAllPagesButton')).toBeNull();
+      });
+
+      it('should show the Select everything on all pages button if all agents are selected and there are more selectable agents', () => {
+        const res = render({ ...defaultProps, selectedAgents: generateAgents(20) });
+        expect(res.queryByTestId('selectedEverythingOnAllPagesButton')).not.toBeNull();
+      });
+    });
+  });
+
+  describe('when selection mode is query', () => {
+    describe('when there are agents', () => {
+      it('should show the number of selected agents and the Clear selection button', () => {
+        const res = render({
+          ...defaultProps,
+          selectionMode: 'query',
+          selectedAgents: generateAgents(2),
+        });
+        expect(res.queryByTestId('selectedAgentCountLabel')).not.toBeNull();
+        expect(res.queryByTestId('clearAgentSelectionButton')).not.toBeNull();
+      });
+
+      it('should not show the Select everything on all pages button', () => {
+        const res = render({
+          ...defaultProps,
+          selectionMode: 'query',
+          selectedAgents: generateAgents(20),
+        });
+        expect(res.queryByTestId('selectedEverythingOnAllPagesButton')).toBeNull();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.tsx
index 57728f275ccb5..0e1b6e43db46e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agents_selection_status.tsx
@@ -34,6 +34,7 @@ const Button = styled(EuiButtonEmpty)`
 export const AgentsSelectionStatus: React.FunctionComponent<{
   totalAgents: number;
   selectableAgents: number;
+  managedAgentsOnCurrentPage: number;
   selectionMode: SelectionMode;
   setSelectionMode: (mode: SelectionMode) => void;
   selectedAgents: Agent[];
@@ -41,15 +42,19 @@ export const AgentsSelectionStatus: React.FunctionComponent<{
 }> = ({
   totalAgents,
   selectableAgents,
+  managedAgentsOnCurrentPage,
   selectionMode,
   setSelectionMode,
   selectedAgents,
   setSelectedAgents,
 }) => {
+  const showSelectionInfoAndOptions =
+    (selectionMode === 'manual' && selectedAgents.length > 0) ||
+    (selectionMode === 'query' && totalAgents > 0);
   const showSelectEverything =
     selectionMode === 'manual' &&
     selectedAgents.length === selectableAgents &&
-    selectableAgents < totalAgents;
+    selectableAgents < totalAgents - managedAgentsOnCurrentPage;
 
   return (
     <>
@@ -74,14 +79,13 @@ export const AgentsSelectionStatus: React.FunctionComponent<{
             )}
           </EuiText>
         </EuiFlexItem>
-        {(selectionMode === 'manual' && selectedAgents.length) ||
-        (selectionMode === 'query' && totalAgents > 0) ? (
+        {showSelectionInfoAndOptions ? (
           <>
             <FlexItem grow={false}>
               <Divider />
             </FlexItem>
             <EuiFlexItem grow={false}>
-              <EuiText size="xs" color="subdued">
+              <EuiText size="xs" color="subdued" data-test-subj="selectedAgentCountLabel">
                 <FormattedMessage
                   id="xpack.fleet.agentBulkActions.agentsSelected"
                   defaultMessage="{count, plural, one {# agent} other {# agents} =all {All agents}} selected"
@@ -97,7 +101,12 @@ export const AgentsSelectionStatus: React.FunctionComponent<{
                   <Divider />
                 </FlexItem>
                 <EuiFlexItem grow={false}>
-                  <Button size="xs" flush="left" onClick={() => setSelectionMode('query')}>
+                  <Button
+                    size="xs"
+                    flush="left"
+                    data-test-subj="selectedEverythingOnAllPagesButton"
+                    onClick={() => setSelectionMode('query')}
+                  >
                     <FormattedMessage
                       id="xpack.fleet.agentBulkActions.selectAll"
                       defaultMessage="Select everything on all pages"
@@ -113,6 +122,7 @@ export const AgentsSelectionStatus: React.FunctionComponent<{
               <Button
                 size="xs"
                 flush="left"
+                data-test-subj="clearAgentSelectionButton"
                 onClick={() => {
                   setSelectionMode('manual');
                   setSelectedAgents([]);
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx
index 37f67dd9e6a41..20fb4bb83dac8 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.test.tsx
@@ -15,8 +15,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 import { ExperimentalFeaturesService } from '../../../../services';
 import { AgentReassignAgentPolicyModal } from '../../components/agent_reassign_policy_modal';
 
-import { sendGetAgents, sendGetAgentPolicies } from '../../../../hooks';
-
 import { AgentBulkActions } from './bulk_actions';
 
 jest.mock('../../../../../../services/experimental_features');
@@ -24,14 +22,22 @@ const mockedExperimentalFeaturesService = jest.mocked(ExperimentalFeaturesServic
 
 jest.mock('../../../../hooks', () => ({
   ...jest.requireActual('../../../../hooks'),
-  sendGetAgents: jest.fn(),
-  sendGetAgentPolicies: jest.fn(),
 }));
 
 jest.mock('../../components/agent_reassign_policy_modal');
 
-const mockedSendGetAgents = sendGetAgents as jest.Mock;
-const mockedSendGetAgentPolicies = sendGetAgentPolicies as jest.Mock;
+const defaultProps = {
+  shownAgents: 10,
+  inactiveShownAgents: 0,
+  totalManagedAgentIds: [],
+  selectionMode: 'manual',
+  currentQuery: '',
+  selectedAgents: [],
+  visibleAgents: [],
+  refreshAgents: () => undefined,
+  allTags: [],
+  agentPolicies: [],
+};
 
 describe('AgentBulkActions', () => {
   beforeAll(() => {
@@ -53,23 +59,13 @@ describe('AgentBulkActions', () => {
 
   describe('When in manual mode', () => {
     it('should show only disabled actions if no agents are active', async () => {
-      const selectedAgents: Agent[] = [{ id: 'agent1' }, { id: 'agent2' }] as Agent[];
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 10,
-        selectionMode: 'manual',
-        currentQuery: '',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
+      const results = render({
+        ...defaultProps,
+        inactiveShownAgents: 10,
+        selectedAgents: [{ id: 'agent1' }, { id: 'agent2' }] as Agent[],
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
@@ -84,26 +80,15 @@ describe('AgentBulkActions', () => {
     });
 
     it('should show available actions for 2 selected agents if they are active', async () => {
-      const selectedAgents: Agent[] = [
-        { id: 'agent1', tags: ['oldTag'], active: true },
-        { id: 'agent2', active: true },
-      ] as Agent[];
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
-        selectionMode: 'manual',
-        currentQuery: '',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
+      const results = render({
+        ...defaultProps,
+        selectedAgents: [
+          { id: 'agent1', tags: ['oldTag'], active: true },
+          { id: 'agent2', active: true },
+        ] as Agent[],
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
@@ -121,27 +106,15 @@ describe('AgentBulkActions', () => {
         diagnosticFileUploadEnabled: true,
       } as any);
 
-      const selectedAgents: Agent[] = [
-        { id: 'agent1', tags: ['oldTag'], active: true },
-        { id: 'agent2', active: true },
-      ] as Agent[];
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
-        selectionMode: 'manual',
-        currentQuery: '',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-        unselectableAgents: [],
-      };
-      const results = render(props);
+      const results = render({
+        ...defaultProps,
+        selectedAgents: [
+          { id: 'agent1', tags: ['oldTag'], active: true },
+          { id: 'agent2', active: true },
+        ] as Agent[],
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
@@ -153,45 +126,13 @@ describe('AgentBulkActions', () => {
   });
 
   describe('When in query mode', () => {
-    it('should show correct actions for the active agents', async () => {
-      mockedSendGetAgentPolicies.mockResolvedValue({
-        data: {
-          items: [
-            {
-              name: 'Managed agent policy',
-              namespace: 'default',
-              description: '',
-              monitoring_enabled: ['logs', 'metrics'],
-              is_managed: true,
-              id: 'test-managed-policy',
-            },
-          ],
-        },
-      });
-      mockedSendGetAgents.mockResolvedValueOnce({
-        data: {
-          items: [],
-          total: 0,
-          totalInactive: 0,
-        },
-      });
-      const selectedAgents: Agent[] = [];
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
+    it('should show correct actions for active agents when no managed policies exist', async () => {
+      const results = render({
+        ...defaultProps,
         selectionMode: 'query',
-        currentQuery: '(Base query)',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
@@ -208,44 +149,13 @@ describe('AgentBulkActions', () => {
     });
 
     it('should show correct actions for the active agents and exclude the managed agents from the count', async () => {
-      const selectedAgents: Agent[] = [];
-      mockedSendGetAgentPolicies.mockResolvedValue({
-        data: {
-          items: [
-            {
-              name: 'Managed agent policy',
-              namespace: 'default',
-              description: '',
-              monitoring_enabled: ['logs', 'metrics'],
-              is_managed: true,
-              id: 'test-managed-policy',
-            },
-          ],
-        },
-      });
-      mockedSendGetAgents.mockResolvedValueOnce({
-        data: {
-          items: ['agentId1', 'agentId2'],
-          total: 2,
-          totalInactive: 0,
-        },
-      });
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
+      const results = render({
+        ...defaultProps,
+        totalManagedAgentIds: ['agentId1', 'agentId2'],
         selectionMode: 'query',
-        currentQuery: '(Base query)',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
@@ -261,89 +171,19 @@ describe('AgentBulkActions', () => {
       expect(results.getByText('Restart upgrade 8 agents').closest('button')!).toBeEnabled();
     });
 
-    it('should show correct actions when no managed policies exist', async () => {
-      const selectedAgents: Agent[] = [];
-      mockedSendGetAgentPolicies.mockResolvedValue({
-        data: {
-          items: [],
-        },
-      });
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
-        selectionMode: 'query',
-        currentQuery: '(Base query)',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
-
-      const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
-      await act(async () => {
-        fireEvent.click(bulkActionsButton);
-      });
-
-      expect(results.getByText('Add / remove tags').closest('button')!).toBeEnabled();
-      expect(results.getByText('Assign to new policy').closest('button')!).toBeEnabled();
-      expect(results.getByText('Unenroll 10 agents').closest('button')!).toBeEnabled();
-      expect(results.getByText('Upgrade 10 agents').closest('button')!).toBeEnabled();
-      expect(results.getByText('Schedule upgrade for 10 agents').closest('button')!).toBeDisabled();
-      expect(
-        results.getByText('Request diagnostics for 10 agents').closest('button')!
-      ).toBeEnabled();
-      expect(results.getByText('Restart upgrade 10 agents').closest('button')!).toBeEnabled();
-    });
-
     it('should generate a correct kuery to select agents', async () => {
-      mockedSendGetAgentPolicies.mockResolvedValue({
-        data: {
-          items: [
-            {
-              name: 'Managed agent policy',
-              namespace: 'default',
-              description: '',
-              monitoring_enabled: ['logs', 'metrics'],
-              is_managed: true,
-              id: 'test-managed-policy',
-            },
-          ],
-        },
-      });
-      mockedSendGetAgents.mockResolvedValueOnce({
-        data: {
-          items: [],
-          total: 0,
-          totalInactive: 0,
-        },
-      });
-      const selectedAgents: Agent[] = [];
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
+      const results = render({
+        ...defaultProps,
         selectionMode: 'query',
         currentQuery: '(Base query)',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
 
       expect(results.getByText('Assign to new policy').closest('button')!).toBeEnabled();
-
       await act(async () => {
         fireEvent.click(results.getByText('Assign to new policy').closest('button')!);
       });
@@ -357,50 +197,19 @@ describe('AgentBulkActions', () => {
     });
 
     it('should generate a correct kuery to select agents with managed agents too', async () => {
-      const selectedAgents: Agent[] = [];
-      mockedSendGetAgentPolicies.mockResolvedValue({
-        data: {
-          items: [
-            {
-              name: 'Managed agent policy',
-              namespace: 'default',
-              description: '',
-              monitoring_enabled: ['logs', 'metrics'],
-              is_managed: true,
-              id: 'test-managed-policy',
-            },
-          ],
-        },
-      });
-      mockedSendGetAgents.mockResolvedValueOnce({
-        data: {
-          items: [{ id: 'agentId1' }, { id: 'agentId2' }],
-          total: 2,
-          totalInactive: 0,
-        },
-      });
-
-      const props = {
-        totalAgents: 10,
-        totalInactiveAgents: 0,
+      const results = render({
+        ...defaultProps,
+        totalManagedAgentIds: ['agentId1', 'agentId2'],
         selectionMode: 'query',
         currentQuery: '(Base query)',
-        selectedAgents,
-        visibleAgents: [],
-        refreshAgents: () => undefined,
-        allTags: [],
-        agentPolicies: [],
-      };
-      const results = render(props);
+      });
 
       const bulkActionsButton = results.getByTestId('agentBulkActionsButton');
-
       await act(async () => {
         fireEvent.click(bulkActionsButton);
       });
 
       expect(results.getByText('Assign to new policy').closest('button')!).toBeEnabled();
-
       await act(async () => {
         fireEvent.click(results.getByText('Assign to new policy').closest('button')!);
       });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx
index 03ffc5fd615ee..6ae366f1dbb98 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useMemo, useState, useEffect, useCallback } from 'react';
+import React, { useMemo, useState } from 'react';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -23,13 +23,8 @@ import {
   AgentUnenrollAgentModal,
   AgentUpgradeAgentModal,
 } from '../../components';
-import { useLicense, sendGetAgents, sendGetAgentPolicies } from '../../../../hooks';
-import {
-  LICENSE_FOR_SCHEDULE_UPGRADE,
-  AGENTS_PREFIX,
-  SO_SEARCH_LIMIT,
-  AGENT_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../../../../common/constants';
+import { useLicense } from '../../../../hooks';
+import { LICENSE_FOR_SCHEDULE_UPGRADE, AGENTS_PREFIX } from '../../../../../../../common/constants';
 import { ExperimentalFeaturesService } from '../../../../services';
 
 import { getCommonTags } from '../utils';
@@ -40,8 +35,9 @@ import type { SelectionMode } from './types';
 import { TagsAddRemove } from './tags_add_remove';
 
 export interface Props {
-  totalAgents: number;
-  totalInactiveAgents: number;
+  shownAgents: number;
+  inactiveShownAgents: number;
+  totalManagedAgentIds: string[];
   selectionMode: SelectionMode;
   currentQuery: string;
   selectedAgents: Agent[];
@@ -52,8 +48,9 @@ export interface Props {
 }
 
 export const AgentBulkActions: React.FunctionComponent<Props> = ({
-  totalAgents,
-  totalInactiveAgents,
+  shownAgents,
+  inactiveShownAgents,
+  totalManagedAgentIds,
   selectionMode,
   currentQuery,
   selectedAgents,
@@ -81,78 +78,30 @@ export const AgentBulkActions: React.FunctionComponent<Props> = ({
   const [isTagAddVisible, setIsTagAddVisible] = useState<boolean>(false);
   const [isRequestDiagnosticsModalOpen, setIsRequestDiagnosticsModalOpen] =
     useState<boolean>(false);
-  const [managedAgents, setManagedAgents] = useState<string[]>([]);
-
-  // get all the managed policies
-  const fetchManagedAgents = useCallback(async () => {
-    if (selectionMode === 'query') {
-      const managedPoliciesKuery = `${AGENT_POLICY_SAVED_OBJECT_TYPE}.is_managed:true`;
-
-      const agentPoliciesResponse = await sendGetAgentPolicies({
-        kuery: managedPoliciesKuery,
-        perPage: SO_SEARCH_LIMIT,
-        full: false,
-      });
-
-      if (agentPoliciesResponse.error) {
-        throw new Error(agentPoliciesResponse.error.message);
-      }
-
-      const managedPolicies = agentPoliciesResponse.data?.items ?? [];
-
-      if (managedPolicies.length === 0) {
-        return [];
-      }
-
-      // find all the agents that have those policies and are not unenrolled
-      const policiesKuery = managedPolicies
-        .map((policy) => `policy_id:"${policy.id}"`)
-        .join(' or ');
-      const kuery = `NOT (status:unenrolled) and ${policiesKuery}`;
-      const response = await sendGetAgents({
-        kuery,
-        perPage: SO_SEARCH_LIMIT,
-        showInactive: true,
-      });
-
-      if (response.error) {
-        throw new Error(response.error.message);
-      }
-
-      return response.data?.items ?? [];
-    }
-    return [];
-  }, [selectionMode]);
-
-  useEffect(() => {
-    async function fetchDataAsync() {
-      const allManagedAgents = await fetchManagedAgents();
-      setManagedAgents(allManagedAgents?.map((agent) => agent.id));
-    }
-    fetchDataAsync();
-  }, [fetchManagedAgents]);
 
   // update the query removing the "managed" agents
   const selectionQuery = useMemo(() => {
-    if (managedAgents.length) {
-      const excludedKuery = `${AGENTS_PREFIX}.agent.id : (${managedAgents
+    if (totalManagedAgentIds.length) {
+      const excludedKuery = `${AGENTS_PREFIX}.agent.id : (${totalManagedAgentIds
         .map((id) => `"${id}"`)
         .join(' or ')})`;
       return `${currentQuery} AND NOT (${excludedKuery})`;
     } else {
       return currentQuery;
     }
-  }, [currentQuery, managedAgents]);
+  }, [currentQuery, totalManagedAgentIds]);
 
   // Check if user is working with only inactive agents
   const atLeastOneActiveAgentSelected =
     selectionMode === 'manual'
       ? !!selectedAgents.find((agent) => agent.active)
-      : totalAgents > totalInactiveAgents;
-  const totalActiveAgents = totalAgents - totalInactiveAgents;
+      : shownAgents > inactiveShownAgents;
+  const totalActiveAgents = shownAgents - inactiveShownAgents;
 
   const agentCount =
-    selectionMode === 'manual' ? selectedAgents.length : totalActiveAgents - managedAgents?.length;
+    selectionMode === 'manual'
+      ? selectedAgents.length
+      : totalActiveAgents - totalManagedAgentIds?.length;
 
   const agents = selectionMode === 'manual' ? selectedAgents : selectionQuery;
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
index 5e1e8f773dedb..07ba1a3402403 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
@@ -45,8 +45,10 @@ describe('SearchAndFilterBar', () => {
   it('should show no Actions button when no agent is selected', async () => {
     const selectedAgents: Agent[] = [];
     const props: any = {
-      totalAgents: 10,
+      shownAgents: 10,
+      inactiveShownAgents: 0,
       totalInactiveAgents: 2,
+      totalManagedAgentIds: [],
       selectionMode: 'manual',
       currentQuery: '',
       selectedAgents,
@@ -77,8 +79,10 @@ describe('SearchAndFilterBar', () => {
       },
     ];
     const props: any = {
-      totalAgents: 10,
+      shownAgents: 10,
+      inactiveShownAgents: 0,
       totalInactiveAgents: 2,
+      totalManagedAgentIds: [],
       selectionMode: 'manual',
       currentQuery: '',
       selectedAgents,
@@ -97,8 +101,10 @@ describe('SearchAndFilterBar', () => {
 
   it('should show an Actions button when agents selected in query mode', async () => {
     const props: any = {
-      totalAgents: 10,
+      shownAgents: 10,
+      inactiveShownAgents: 0,
       totalInactiveAgents: 2,
+      totalManagedAgentIds: [],
       selectionMode: 'query',
       currentQuery: '',
       selectedAgents: [],
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
index 27b62d54bd789..99ca44a8f7e6b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
@@ -55,8 +55,10 @@ export interface SearchAndFilterBarProps {
   tags: string[];
   selectedTags: string[];
   onSelectedTagsChange: (selectedTags: string[]) => void;
-  totalAgents: number;
+  shownAgents: number;
+  inactiveShownAgents: number;
   totalInactiveAgents: number;
+  totalManagedAgentIds: string[];
   selectionMode: SelectionMode;
   currentQuery: string;
   selectedAgents: Agent[];
@@ -82,8 +84,10 @@ export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps
   tags,
   selectedTags,
   onSelectedTagsChange,
-  totalAgents,
+  shownAgents,
+  inactiveShownAgents,
   totalInactiveAgents,
+  totalManagedAgentIds,
   selectionMode,
   currentQuery,
   selectedAgents,
@@ -330,11 +334,12 @@ export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps
               </EuiFilterGroup>
             </EuiFlexItem>
             {(selectionMode === 'manual' && selectedAgents.length) ||
-            (selectionMode === 'query' && totalAgents > 0) ? (
+            (selectionMode === 'query' && shownAgents > 0) ? (
               <EuiFlexItem grow={false}>
                 <AgentBulkActions
-                  totalAgents={totalAgents}
-                  totalInactiveAgents={totalInactiveAgents}
+                  shownAgents={shownAgents}
+                  inactiveShownAgents={inactiveShownAgents}
+                  totalManagedAgentIds={totalManagedAgentIds}
                   selectionMode={selectionMode}
                   currentQuery={currentQuery}
                   selectedAgents={selectedAgents}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_header.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_header.tsx
index 95db01554b6ea..a6375bec6a39a 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_header.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_header.tsx
@@ -22,6 +22,7 @@ export const AgentTableHeader: React.FunctionComponent<{
   showInactive: boolean;
   totalAgents: number;
   selectableAgents: number;
+  managedAgentsOnCurrentPage: number;
   selectionMode: SelectionMode;
   setSelectionMode: (mode: SelectionMode) => void;
   selectedAgents: Agent[];
@@ -32,6 +33,7 @@ export const AgentTableHeader: React.FunctionComponent<{
   agentStatus,
   totalAgents,
   selectableAgents,
+  managedAgentsOnCurrentPage,
   selectionMode,
   setSelectionMode,
   selectedAgents,
@@ -48,6 +50,7 @@ export const AgentTableHeader: React.FunctionComponent<{
             <AgentsSelectionStatus
               totalAgents={totalAgents}
               selectableAgents={selectableAgents}
+              managedAgentsOnCurrentPage={managedAgentsOnCurrentPage}
               selectionMode={selectionMode}
               setSelectionMode={setSelectionMode}
               selectedAgents={selectedAgents}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx
index 030dc857f9d4b..49b1e74014341 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx
@@ -49,6 +49,7 @@ jest.mock('../../../hooks', () => ({
   },
   useFleetStatus: jest.fn().mockReturnValue({}),
   sendGetAgentStatus: jest.fn(),
+  sendGetAgentPolicies: jest.fn().mockReturnValue({ data: { items: [] } }),
   sendGetAgentTags: jest.fn().mockReturnValue({ data: { items: ['tag1', 'tag2'] } }),
   useAuthz: jest.fn().mockReturnValue({ fleet: { all: true } }),
   useStartServices: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
index 27e7836759e88..a3c5fc4d09317 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
@@ -24,6 +24,7 @@ import {
   useFlyoutContext,
   sendGetAgentTags,
   useFleetServerStandalone,
+  sendGetAgentPolicies,
 } from '../../../hooks';
 import { AgentEnrollmentFlyout, UninstallCommandFlyout } from '../../../components';
 import {
@@ -31,7 +32,7 @@ import {
   ExperimentalFeaturesService,
   policyHasFleetServer,
 } from '../../../services';
-import { SO_SEARCH_LIMIT } from '../../../constants';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE, SO_SEARCH_LIMIT } from '../../../constants';
 import {
   AgentReassignAgentPolicyModal,
   AgentUnenrollAgentModal,
@@ -177,14 +178,17 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
     });
   }, [search, selectedAgentPolicies, selectedStatus, selectedTags]);
 
-  const [agents, setAgents] = useState<Agent[]>([]);
+  const [agentsOnCurrentPage, setAgentsOnCurrentPage] = useState<Agent[]>([]);
   const [agentsStatus, setAgentsStatus] = useState<
     { [key in SimplifiedAgentStatus]: number } | undefined
   >();
   const [allTags, setAllTags] = useState<string[]>();
   const [isLoading, setIsLoading] = useState(false);
-  const [totalAgents, setTotalAgents] = useState(0);
+  const [shownAgents, setShownAgents] = useState(0);
+  const [inactiveShownAgents, setInactiveShownAgents] = useState(0);
   const [totalInactiveAgents, setTotalInactiveAgents] = useState(0);
+  const [totalManagedAgentIds, setTotalManagedAgentIds] = useState<string[]>([]);
+  const [managedAgentsOnCurrentPage, setManagedAgentsOnCurrentPage] = useState(0);
   const [showAgentActivityTour, setShowAgentActivityTour] = useState({ isOpen: false });
   const getSortFieldForAPI = (field: keyof Agent): string => {
     if ([VERSION_FIELD, HOSTNAME_FIELD].includes(field as string)) {
@@ -236,27 +240,36 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
 
         try {
           setIsLoading(true);
-          const [agentsResponse, totalInactiveAgentsResponse, agentTagsResponse] =
-            await Promise.all([
-              sendGetAgents({
-                page: pagination.currentPage,
-                perPage: pagination.pageSize,
-                kuery: kuery && kuery !== '' ? kuery : undefined,
-                sortField: getSortFieldForAPI(sortField),
-                sortOrder,
-                showInactive,
-                showUpgradeable,
-                getStatusSummary: true,
-                withMetrics: displayAgentMetrics,
-              }),
-              sendGetAgentStatus({
-                kuery: AgentStatusKueryHelper.buildKueryForInactiveAgents(),
-              }),
-              sendGetAgentTags({
-                kuery: kuery && kuery !== '' ? kuery : undefined,
-                showInactive,
-              }),
-            ]);
+          const [
+            agentsResponse,
+            totalInactiveAgentsResponse,
+            managedAgentPoliciesResponse,
+            agentTagsResponse,
+          ] = await Promise.all([
+            sendGetAgents({
+              page: pagination.currentPage,
+              perPage: pagination.pageSize,
+              kuery: kuery && kuery !== '' ? kuery : undefined,
+              sortField: getSortFieldForAPI(sortField),
+              sortOrder,
+              showInactive,
+              showUpgradeable,
+              getStatusSummary: true,
+              withMetrics: displayAgentMetrics,
+            }),
+            sendGetAgentStatus({
+              kuery: AgentStatusKueryHelper.buildKueryForInactiveAgents(),
+            }),
+            sendGetAgentPolicies({
+              kuery: `${AGENT_POLICY_SAVED_OBJECT_TYPE}.is_managed:true`,
+              perPage: SO_SEARCH_LIMIT,
+              full: false,
+            }),
+            sendGetAgentTags({
+              kuery: kuery && kuery !== '' ? kuery : undefined,
+              showInactive,
+            }),
+          ]);
           isLoadingVar.current = false;
           // Return if a newer request has been triggered
           if (currentRequestRef.current !== currentRequest) {
@@ -271,6 +284,9 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
           if (!totalInactiveAgentsResponse.data) {
             throw new Error('Invalid GET /agents_status response');
           }
+          if (managedAgentPoliciesResponse.error) {
+            throw new Error(managedAgentPoliciesResponse.error.message);
+          }
           if (agentTagsResponse.error) {
             throw agentTagsResponse.error;
           }
@@ -279,14 +295,12 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
           }
 
           const statusSummary = agentsResponse.data.statusSummary;
-
           if (!statusSummary) {
             throw new Error('Invalid GET /agents response - no status summary');
           }
           setAgentsStatus(agentStatusesToSummary(statusSummary));
 
           const newAllTags = agentTagsResponse.data.items;
-
           // We only want to update the list of available tags if
           // - We haven't set any tags yet
           // - We've received the "refreshTags" flag which will force a refresh of the tags list when an agent is unenrolled
@@ -295,9 +309,40 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
             setAllTags(newAllTags);
           }
 
-          setAgents(agentsResponse.data.items);
-          setTotalAgents(agentsResponse.data.total);
+          setAgentsOnCurrentPage(agentsResponse.data.items);
+          setShownAgents(agentsResponse.data.total);
           setTotalInactiveAgents(totalInactiveAgentsResponse.data.results.inactive || 0);
+          setInactiveShownAgents(
+            showInactive ? totalInactiveAgentsResponse.data.results.inactive || 0 : 0
+          );
+
+          const managedAgentPolicies = managedAgentPoliciesResponse.data?.items ?? [];
+          if (managedAgentPolicies.length === 0) {
+            setTotalManagedAgentIds([]);
+            setManagedAgentsOnCurrentPage(0);
+          } else {
+            // Find all the agents that have managed policies and are not unenrolled
+            const policiesKuery = managedAgentPolicies
+              .map((policy) => `policy_id:"${policy.id}"`)
+              .join(' or ');
+            const response = await sendGetAgents({
+              kuery: `NOT (status:unenrolled) and ${policiesKuery}`,
+              perPage: SO_SEARCH_LIMIT,
+              showInactive: true,
+            });
+            if (response.error) {
+              throw new Error(response.error.message);
+            }
+            const allManagedAgents = response.data?.items ?? [];
+            const allManagedAgentIds = allManagedAgents?.map((agent) => agent.id);
+            setTotalManagedAgentIds(allManagedAgentIds);
+
+            setManagedAgentsOnCurrentPage(
+              agentsResponse.data.items
+                .map((agent) => agent.id)
+                .filter((agentId) => allManagedAgentIds.includes(agentId)).length
+            );
+          }
         } catch (error) {
           notifications.toasts.addError(error, {
             title: i18n.translate('xpack.fleet.agentList.errorFetchingDataTitle', {
@@ -367,13 +412,14 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
     if (selectionMode === 'query' && newAgents.length < selectedAgents.length) {
       // differentiating between selection changed by agents dropping from current page or user action
       const areSelectedAgentsStillVisible =
-        selectedAgents.length > 0 && differenceBy(selectedAgents, agents, 'id').length === 0;
+        selectedAgents.length > 0 &&
+        differenceBy(selectedAgents, agentsOnCurrentPage, 'id').length === 0;
       if (areSelectedAgentsStillVisible) {
         setSelectionMode('manual');
       } else {
         // force selecting all agents on current page if staying in query mode
         if (tableRef?.current) {
-          tableRef.current.setSelection(agents);
+          tableRef.current.setSelection(agentsOnCurrentPage);
         }
       }
     }
@@ -556,15 +602,17 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
         tags={allTags ?? []}
         selectedTags={selectedTags}
         onSelectedTagsChange={setSelectedTags}
-        totalAgents={totalAgents}
+        shownAgents={shownAgents}
+        inactiveShownAgents={inactiveShownAgents}
         totalInactiveAgents={totalInactiveAgents}
+        totalManagedAgentIds={totalManagedAgentIds}
         selectionMode={selectionMode}
         currentQuery={kuery}
         selectedAgents={selectedAgents}
         refreshAgents={refreshAgents}
         onClickAddAgent={() => setEnrollmentFlyoutState({ isOpen: true })}
         onClickAddFleetServer={onClickAddFleetServer}
-        visibleAgents={agents}
+        visibleAgents={agentsOnCurrentPage}
         onClickAgentActivity={onClickAgentActivity}
         showAgentActivityTour={showAgentActivityTour}
       />
@@ -572,9 +620,10 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
       {/* Agent total, bulk actions and status bar */}
       <AgentTableHeader
         showInactive={showInactive}
-        totalAgents={totalAgents}
+        totalAgents={shownAgents}
         agentStatus={agentsStatus}
-        selectableAgents={agents?.filter(isAgentSelectable).length || 0}
+        selectableAgents={agentsOnCurrentPage?.filter(isAgentSelectable).length || 0}
+        managedAgentsOnCurrentPage={managedAgentsOnCurrentPage}
         selectionMode={selectionMode}
         setSelectionMode={setSelectionMode}
         selectedAgents={selectedAgents}
@@ -590,7 +639,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
       <EuiSpacer size="s" />
       {/* Agent list table */}
       <AgentListTable
-        agents={agents}
+        agents={agentsOnCurrentPage}
         sortField={sortField}
         pageSizeOptions={pageSizeOptions}
         sortOrder={sortOrder}
@@ -602,7 +651,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
         showUpgradeable={showUpgradeable}
         onTableChange={onTableChange}
         pagination={pagination}
-        totalAgents={Math.min(totalAgents, SO_SEARCH_LIMIT)}
+        totalAgents={Math.min(shownAgents, SO_SEARCH_LIMIT)}
         isUsingFilter={isUsingFilter}
         setEnrollmentFlyoutState={setEnrollmentFlyoutState}
         clearFilters={clearFilters}
diff --git a/x-pack/plugins/task_manager/server/metrics/task_overdue_metrics_aggregator.ts b/x-pack/plugins/task_manager/server/metrics/task_overdue_metrics_aggregator.ts
index 735e93abe0e72..4743889e7ebf9 100644
--- a/x-pack/plugins/task_manager/server/metrics/task_overdue_metrics_aggregator.ts
+++ b/x-pack/plugins/task_manager/server/metrics/task_overdue_metrics_aggregator.ts
@@ -19,7 +19,7 @@ import {
 import { TaskManagerMetrics } from './task_metrics_collector';
 import { ITaskMetricsAggregator } from './types';
 
-const HDR_HISTOGRAM_MAX = 1800; // 30 minutes
+const HDR_HISTOGRAM_MAX = 5400; // 90 minutes
 const HDR_HISTOGRAM_BUCKET_SIZE = 10; // 10 seconds
 
 const OVERDUE_BY_KEY = 'overdue_by';
diff --git a/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts b/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts
index 91edc9f783cd5..ca7a88f9d42a7 100644
--- a/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts
+++ b/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts
@@ -25,7 +25,7 @@ import {
 } from './lib';
 import { ITaskMetricsAggregator } from './types';
 
-const HDR_HISTOGRAM_MAX = 1800; // 30 minutes
+const HDR_HISTOGRAM_MAX = 5400; // 90 minutes
 const HDR_HISTOGRAM_BUCKET_SIZE = 10; // 10 seconds
 
 enum TaskRunKeys {
diff --git a/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
index d439663e8d0d8..fb908f7bbe9c8 100644
--- a/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
@@ -184,7 +184,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     },
     {
       req: {
-        url: `/internal/apm/services/foo/metadata/details?start=${start}&end=${end}`,
+        url: `/internal/apm/services/foo/metadata/details?start=${start}&end=${end}&environment=dev`,
       },
       expectForbidden: expect403,
       expectResponse: expect200,
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts b/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
index 1933d3552e611..f32c7bcb4083e 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
@@ -32,6 +32,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         query: {
           start: new Date(start).toISOString(),
           end: new Date(end).toISOString(),
+          environment: 'production',
         },
       },
     });
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details/service_infra_metrics.spec.ts b/x-pack/test/apm_api_integration/tests/services/service_details/service_infra_metrics.spec.ts
index 0a5d2f88453a6..194b266e927e8 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_details/service_infra_metrics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_details/service_infra_metrics.spec.ts
@@ -6,6 +6,7 @@
  */
 import expect from '@kbn/expect';
 import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { ENVIRONMENT_ALL } from '@kbn/apm-plugin/common/environment_filter_values';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
 
@@ -94,6 +95,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               query: {
                 start,
                 end,
+                environment: ENVIRONMENT_ALL.value,
               },
             },
           });
@@ -124,6 +126,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               query: {
                 start,
                 end,
+                environment: ENVIRONMENT_ALL.value,
               },
             },
           });
@@ -151,6 +154,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               query: {
                 start,
                 end,
+                environment: ENVIRONMENT_ALL.value,
               },
             },
           });