diff --git a/.lycheeignore b/.lycheeignore
index 82348e6f047c..839c7454eb5d 100644
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -91,3 +91,4 @@ https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
 http:/adomas.org/javascript-mouse-wheel/
 site.com
 http://sites.google.com/site/murmurhash/
+helpmenow.com
diff --git a/changelogs/fragments/8352.yml b/changelogs/fragments/8352.yml
new file mode 100644
index 000000000000..048f8a94a22a
--- /dev/null
+++ b/changelogs/fragments/8352.yml
@@ -0,0 +1,2 @@
+fix:
+- Add discover summary error info and button click logic enhancement ([#8352](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8352))
diff --git a/changelogs/fragments/8504.yml b/changelogs/fragments/8504.yml
new file mode 100644
index 000000000000..3ccc6590581d
--- /dev/null
+++ b/changelogs/fragments/8504.yml
@@ -0,0 +1,6 @@
+feat:
+- Allow hiding the TSVB axis for time series visualizations ([#8504](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8504))
+- Allow setting scale of each axis for TSVB time series ([#8504](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8504))
+
+fix:
+- Compress non-OUI input fields in TSVB visualizations ([#8504](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8504))
\ No newline at end of file
diff --git a/changelogs/fragments/8520.yml b/changelogs/fragments/8520.yml
new file mode 100644
index 000000000000..f0883088331f
--- /dev/null
+++ b/changelogs/fragments/8520.yml
@@ -0,0 +1,2 @@
+feat:
+- [Workspace]Remove collaborators in workspace creation page ([#8520](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8520))
\ No newline at end of file
diff --git a/changelogs/fragments/8531.yml b/changelogs/fragments/8531.yml
new file mode 100644
index 000000000000..e23c5eba1faa
--- /dev/null
+++ b/changelogs/fragments/8531.yml
@@ -0,0 +1,2 @@
+feat:
+- [Workspace]Display duplicate collaborators error in add collaborators modal ([#8531](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8531))
\ No newline at end of file
diff --git a/changelogs/fragments/8538.yml b/changelogs/fragments/8538.yml
new file mode 100644
index 000000000000..31ccc192392d
--- /dev/null
+++ b/changelogs/fragments/8538.yml
@@ -0,0 +1,2 @@
+feat:
+- [Workspace] Add global search bar into left nav ([#8538](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8538))
\ No newline at end of file
diff --git a/changelogs/fragments/8540.yml b/changelogs/fragments/8540.yml
new file mode 100644
index 000000000000..c0008c804319
--- /dev/null
+++ b/changelogs/fragments/8540.yml
@@ -0,0 +1,2 @@
+feat:
+- [Workspace]Replace connections copy with data sources ([#8540](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8540))
\ No newline at end of file
diff --git a/changelogs/fragments/8541.yml b/changelogs/fragments/8541.yml
new file mode 100644
index 000000000000..5b1b2457bc34
--- /dev/null
+++ b/changelogs/fragments/8541.yml
@@ -0,0 +1,2 @@
+fix:
+- The workspace selector jump that occurs when hovering and clicking. ([#8541](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8541))
\ No newline at end of file
diff --git a/changelogs/fragments/8544.yml b/changelogs/fragments/8544.yml
new file mode 100644
index 000000000000..71d1d815e6dc
--- /dev/null
+++ b/changelogs/fragments/8544.yml
@@ -0,0 +1,2 @@
+fix:
+- Direct query connections fit and finish fixes ([#8544](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8544))
\ No newline at end of file
diff --git a/changelogs/fragments/8545.yml b/changelogs/fragments/8545.yml
new file mode 100644
index 000000000000..ba972ec51e7c
--- /dev/null
+++ b/changelogs/fragments/8545.yml
@@ -0,0 +1,2 @@
+feat:
+- Refactor data source list page to include data source association features for workspace ([#8545](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8545))
\ No newline at end of file
diff --git a/changelogs/fragments/8554.yml b/changelogs/fragments/8554.yml
new file mode 100644
index 000000000000..3c72872e1c0f
--- /dev/null
+++ b/changelogs/fragments/8554.yml
@@ -0,0 +1,2 @@
+fix:
+- Fix new home page small screen display issues ([#8554](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8554))
\ No newline at end of file
diff --git a/changelogs/fragments/8557.yml b/changelogs/fragments/8557.yml
new file mode 100644
index 000000000000..7a9fb57b7f60
--- /dev/null
+++ b/changelogs/fragments/8557.yml
@@ -0,0 +1,2 @@
+feat:
+- Add ACL auditor ([#8557](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8557))
\ No newline at end of file
diff --git a/changelogs/fragments/8564.yml b/changelogs/fragments/8564.yml
new file mode 100644
index 000000000000..bc745037679c
--- /dev/null
+++ b/changelogs/fragments/8564.yml
@@ -0,0 +1,2 @@
+chore:
+- Update oui to 1.16 ([#8564](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8564))
\ No newline at end of file
diff --git a/changelogs/fragments/8570.yml b/changelogs/fragments/8570.yml
new file mode 100644
index 000000000000..e967ac10c560
--- /dev/null
+++ b/changelogs/fragments/8570.yml
@@ -0,0 +1,2 @@
+fix:
+- Fix workspace update issue ([#8570](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8570))
\ No newline at end of file
diff --git a/changelogs/fragments/8574.yml b/changelogs/fragments/8574.yml
new file mode 100644
index 000000000000..72c73d09947a
--- /dev/null
+++ b/changelogs/fragments/8574.yml
@@ -0,0 +1,2 @@
+feat:
+- [Workspace]Show add collaborators modal until collaborators added ([#8574](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8574))
\ No newline at end of file
diff --git a/changelogs/fragments/8581.yml b/changelogs/fragments/8581.yml
new file mode 100644
index 000000000000..5b352fc31fca
--- /dev/null
+++ b/changelogs/fragments/8581.yml
@@ -0,0 +1,2 @@
+fix:
+- Disable cope all button when there is no saved objects in assets page ([#8581](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8581))
\ No newline at end of file
diff --git a/package.json b/package.json
index c741677d90b7..c14548afd48d 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
   "dependencies": {
     "@aws-crypto/client-node": "^3.1.1",
     "@elastic/datemath": "5.0.3",
-    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.16.0",
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0",
     "@elastic/request-crypto": "2.0.0",
diff --git a/packages/osd-i18n/src/core/i18n.test.ts b/packages/osd-i18n/src/core/i18n.test.ts
index ebfd546f8561..ad5ed920fd01 100644
--- a/packages/osd-i18n/src/core/i18n.test.ts
+++ b/packages/osd-i18n/src/core/i18n.test.ts
@@ -178,7 +178,7 @@ describe('I18n engine', () => {
         'en-us'
       );
 
-      expect(i18n.getLocale()).toBe('en-us');
+      expect(i18n.getLocale()).toBe('en-US');
       expect(i18n.getTranslation()).toEqual({
         messages: {
           ['a.b.c']: 'bar',
@@ -246,9 +246,19 @@ describe('I18n engine', () => {
       expect(i18n.getLocale()).toBe('foo');
     });
 
-    test('should normalize passed locale', () => {
-      i18n.setLocale('en-US');
-      expect(i18n.getLocale()).toBe('en-us');
+    test('should normalize basic locale', () => {
+      i18n.setLocale('It-iT');
+      expect(i18n.getLocale()).toBe('it-IT');
+    });
+
+    test('should normalize simple locale', () => {
+      i18n.setLocale('en-LATN-us_PRIVATE-variant');
+      expect(i18n.getLocale()).toBe('en-Latn-US');
+    });
+
+    test('should normalize complex locale', () => {
+      i18n.setLocale('FR-CA-X-FALLBACK-und-u@keyword=calendarKey');
+      expect(i18n.getLocale()).toBe('fr-CA');
     });
   });
 
@@ -280,8 +290,8 @@ describe('I18n engine', () => {
     });
 
     test('should normalize passed locale', () => {
-      i18n.setDefaultLocale('en-US');
-      expect(i18n.getDefaultLocale()).toBe('en-us');
+      i18n.setDefaultLocale('eN-uS');
+      expect(i18n.getDefaultLocale()).toBe('en-US');
     });
 
     test('should set "en" locale as default for IntlMessageFormat and IntlRelativeFormat', () => {
diff --git a/packages/osd-i18n/src/core/i18n.ts b/packages/osd-i18n/src/core/i18n.ts
index 65da4931ef13..fc040bb834e6 100644
--- a/packages/osd-i18n/src/core/i18n.ts
+++ b/packages/osd-i18n/src/core/i18n.ts
@@ -44,6 +44,16 @@ const EN_LOCALE = 'en';
 const translationsForLocale: Record<string, Translation> = {};
 const getMessageFormat = memoizeIntlConstructor(IntlMessageFormat);
 
+/* A locale code is made of several components:
+ *    * lang: The two- and three-letter lower-case language code follows the ISO 639-1 and ISO 639-2/3 standards, respectively.
+ *    * script: The optional four-letter title-case code follows the ISO 15924 standard for representing writing systems.
+ *    * region: The two-letter upper-case region code follows the ISO 3166-1 alpha-2 standard.
+ *
+ * Ref: https://www.rfc-editor.org/rfc/rfc5646.txt
+ * Note: While case carries no distinction with locale codes, proper formatting is recommended.
+ */
+const localeParser = /^(?<lang>[a-z]{2,3})(?:-(?<script>[a-z]{4}))?(?:-(?<region>[a-z]{2}|[0-9]{3}))?(?:[_@\-].*)?$/i;
+
 let defaultLocale = EN_LOCALE;
 let currentLocale = EN_LOCALE;
 let formats = EN_FORMATS;
@@ -64,8 +74,16 @@ function getMessageById(id: string): string | undefined {
  * Normalizes locale to make it consistent with IntlMessageFormat locales
  * @param locale
  */
-function normalizeLocale(locale: string) {
-  return locale.toLowerCase();
+export function normalizeLocale(locale: string) {
+  const { lang, script, region } = localeParser.exec(locale)?.groups || {};
+  // If parsing failed or the language code was not extracted, return the locale
+  if (!lang) return locale;
+
+  const parts = [lang.toLowerCase()];
+  if (script) parts.push(script[0].toUpperCase() + script.slice(1).toLowerCase());
+  if (region) parts.push(region.toUpperCase());
+
+  return parts.join('-');
 }
 
 /**
diff --git a/packages/osd-i18n/src/core/locales.js b/packages/osd-i18n/src/core/locales.js
index 14dfe95507a9..826dce2cbdf2 100644
--- a/packages/osd-i18n/src/core/locales.js
+++ b/packages/osd-i18n/src/core/locales.js
@@ -21,22 +21,49 @@ function addLocaleData(localeData) {
   IntlRelativeFormat.__addLocaleData(localeData);
 }
 
-addLocaleData({ locale: "pl", pluralRuleFunction: function (n, ord) { var s = String(n).split("."), v0 = !s[1], t0 = Number(s[0]) == n, n10 = t0 && s[0].slice(-1), n100 = t0 && s[0].slice(-2); if (ord) return n10 == 1 && n100 != 11 ? "jeden" : n10 == 2 && n100 != 12 ? "dwa" : n10 == 3 && n100 != 13 ? "kilka" : "inny"; return n == 1 && v0 ? "jeden" : "inny" }, "fields": { "rok": { "displayName": "rok", "relative": { "0": "ten rok", "1": "następny rok", "-1": "poprzedni rok" }, "relativeTime": { "future": { "jeden": "za {0} rok", "other": "za {0} lat" }, "past": { "jeden": "{0} rok temu", "other": "{0} lata temu" } } }, "year-short": { "displayName": "rok", "relative": { "0": "ten rok", "1": "następny rok", "-1": "poprzedni rok" }, "relativeTime": { "future": { "one": "za {0} r.", "other": "za {0} l." }, "past": { "one": "{0} r. temu", "other": "{0} l. temu" } } }, "month": { "displayName": "miesiąc", "relative": { "0": "ten miesiąc", "1": "następny miesiąc", "-1": "poprzedni miesiąc" }, "relativeTime": { "future": { "one": "w {0} miesiącu", "other": "w {0} miesiącach" }, "past": { "one": "{0} miesiąc temu", "other": "{0}  miesięcy temu" } } }, "month-short": { "displayName": "miesiąc", "relative": { "0": "ten miesiąc", "1": "następny miesiąc", "-1": "poprzedni miesiąc" }, "relativeTime": { "future": { "one": "z {0} miesiąc", "other": "za {0} miesięcy" }, "past": { "one": "{0} miesiąc temu", "other": "{0} miesięcy temu" } } }, "day": { "displayName": "dzień", "relative": { "0": "dzisiaj", "1": "jutro", "-1": "wczoraj" }, "relativeTime": { "future": { "one": "za {0} dzień", "other": "za {0} dni" }, "past": { "one": "{0} dzień temu", "other": "{0} dni temu" } } }, "day-short": { "displayName": "dzień", "relative": { "0": "dzisiaj", "1": "jutro", "-1": "wczoraj" }, "relativeTime": { "future": { "one": "za {0} dzień", "other": "za {0} dni" }, "past": { "one": "{0} dzień temu", "other": "{0} dni temu" } } }, "hour": { "displayName": "godzina", "relative": { "0": "ta godzina" }, "relativeTime": { "future": { "one": "za {0} godzinę", "other": "za {0} godzin" }, "past": { "one": "{0} godzina temu", "other": "{0} godzin temu" } } }, "hour-short": { "displayName": "godz.", "relative": { "0": "ta godzina" }, "relativeTime": { "future": { "one": "za {0} godz.", "other": "za {0} godz." }, "past": { "one": "{0} godz. temu", "other": "{0} godz. temu" } } }, "minute": { "displayName": "minuta", "relative": { "0": "ta minuta" }, "relativeTime": { "future": { "one": "za {0} minutę", "other": "za {0} minut" }, "past": { "one": "{0} minuta temu", "other": "{0} minut temu" } } }, "minute-short": { "displayName": "min.", "relative": { "0": "ta min." }, "relativeTime": { "future": { "one": "za {0} min.", "other": "za {0} min." }, "past": { "one": "{0} min. temu", "other": "{0} min. temu" } } }, "second": { "displayName": "sekunda", "relative": { "0": "teraz" }, "relativeTime": { "future": { "one": "za {0} sekundę", "other": "za {0} sekund" }, "past": { "one": "{0} sekundę temu", "other": "{0} sekund temu" } } }, "second-short": { "displayName": "sek.", "relative": { "0": "teraz" }, "relativeTime": { "future": { "one": "za {0} sek.", "other": "za {0} sek." }, "past": { "one": "{0} sek. temu", "other": "{0} sek. temu" } } } } });
-addLocaleData({ locale: "pl-PL", parentLocale: "pl" });
+addLocaleData({ locale: "de", pluralRuleFunction: function (n,ord){var s=String(n).split("."),v0=!s[1];if(ord)return"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"Jahr","relative":{"0":"dieses Jahr","1":"nächstes Jahr","-1":"letztes Jahr"},"relativeTime":{"future":{"one":"in {0} Jahr","other":"in {0} Jahren"},"past":{"one":"vor {0} Jahr","other":"vor {0} Jahren"}}},"year-short":{"displayName":"Jahr","relative":{"0":"dieses Jahr","1":"nächstes Jahr","-1":"letztes Jahr"},"relativeTime":{"future":{"one":"in {0} Jahr","other":"in {0} Jahren"},"past":{"one":"vor {0} Jahr","other":"vor {0} Jahren"}}},"month":{"displayName":"Monat","relative":{"0":"diesen Monat","1":"nächsten Monat","-1":"letzten Monat"},"relativeTime":{"future":{"one":"in {0} Monat","other":"in {0} Monaten"},"past":{"one":"vor {0} Monat","other":"vor {0} Monaten"}}},"month-short":{"displayName":"Monat","relative":{"0":"diesen Monat","1":"nächsten Monat","-1":"letzten Monat"},"relativeTime":{"future":{"one":"in {0} Monat","other":"in {0} Monaten"},"past":{"one":"vor {0} Monat","other":"vor {0} Monaten"}}},"day":{"displayName":"Tag","relative":{"0":"heute","1":"morgen","2":"übermorgen","-2":"vorgestern","-1":"gestern"},"relativeTime":{"future":{"one":"in {0} Tag","other":"in {0} Tagen"},"past":{"one":"vor {0} Tag","other":"vor {0} Tagen"}}},"day-short":{"displayName":"Tag","relative":{"0":"heute","1":"morgen","2":"übermorgen","-2":"vorgestern","-1":"gestern"},"relativeTime":{"future":{"one":"in {0} Tag","other":"in {0} Tagen"},"past":{"one":"vor {0} Tag","other":"vor {0} Tagen"}}},"hour":{"displayName":"Stunde","relative":{"0":"in dieser Stunde"},"relativeTime":{"future":{"one":"in {0} Stunde","other":"in {0} Stunden"},"past":{"one":"vor {0} Stunde","other":"vor {0} Stunden"}}},"hour-short":{"displayName":"Std.","relative":{"0":"in dieser Stunde"},"relativeTime":{"future":{"one":"in {0} Std.","other":"in {0} Std."},"past":{"one":"vor {0} Std.","other":"vor {0} Std."}}},"minute":{"displayName":"Minute","relative":{"0":"in dieser Minute"},"relativeTime":{"future":{"one":"in {0} Minute","other":"in {0} Minuten"},"past":{"one":"vor {0} Minute","other":"vor {0} Minuten"}}},"minute-short":{"displayName":"Min.","relative":{"0":"in dieser Minute"},"relativeTime":{"future":{"one":"in {0} Min.","other":"in {0} Min."},"past":{"one":"vor {0} Min.","other":"vor {0} Min."}}},"second":{"displayName":"Sekunde","relative":{"0":"jetzt"},"relativeTime":{"future":{"one":"in {0} Sekunde","other":"in {0} Sekunden"},"past":{"one":"vor {0} Sekunde","other":"vor {0} Sekunden"}}},"second-short":{"displayName":"Sek.","relative":{"0":"jetzt"},"relativeTime":{"future":{"one":"in {0} Sek.","other":"in {0} Sek."},"past":{"one":"vor {0} Sek.","other":"vor {0} Sek."}}}} });
+addLocaleData({ locale: "de-DE", parentLocale: "de" });
 addLocaleData({ locale: "en", pluralRuleFunction: function (n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"year","relative":{"0":"this year","1":"next year","-1":"last year"},"relativeTime":{"future":{"one":"in {0} year","other":"in {0} years"},"past":{"one":"{0} year ago","other":"{0} years ago"}}},"year-short":{"displayName":"yr.","relative":{"0":"this yr.","1":"next yr.","-1":"last yr."},"relativeTime":{"future":{"one":"in {0} yr.","other":"in {0} yr."},"past":{"one":"{0} yr. ago","other":"{0} yr. ago"}}},"month":{"displayName":"month","relative":{"0":"this month","1":"next month","-1":"last month"},"relativeTime":{"future":{"one":"in {0} month","other":"in {0} months"},"past":{"one":"{0} month ago","other":"{0} months ago"}}},"month-short":{"displayName":"mo.","relative":{"0":"this mo.","1":"next mo.","-1":"last mo."},"relativeTime":{"future":{"one":"in {0} mo.","other":"in {0} mo."},"past":{"one":"{0} mo. ago","other":"{0} mo. ago"}}},"day":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"day-short":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"hour":{"displayName":"hour","relative":{"0":"this hour"},"relativeTime":{"future":{"one":"in {0} hour","other":"in {0} hours"},"past":{"one":"{0} hour ago","other":"{0} hours ago"}}},"hour-short":{"displayName":"hr.","relative":{"0":"this hour"},"relativeTime":{"future":{"one":"in {0} hr.","other":"in {0} hr."},"past":{"one":"{0} hr. ago","other":"{0} hr. ago"}}},"minute":{"displayName":"minute","relative":{"0":"this minute"},"relativeTime":{"future":{"one":"in {0} minute","other":"in {0} minutes"},"past":{"one":"{0} minute ago","other":"{0} minutes ago"}}},"minute-short":{"displayName":"min.","relative":{"0":"this minute"},"relativeTime":{"future":{"one":"in {0} min.","other":"in {0} min."},"past":{"one":"{0} min. ago","other":"{0} min. ago"}}},"second":{"displayName":"second","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} second","other":"in {0} seconds"},"past":{"one":"{0} second ago","other":"{0} seconds ago"}}},"second-short":{"displayName":"sec.","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} sec.","other":"in {0} sec."},"past":{"one":"{0} sec. ago","other":"{0} sec. ago"}}}} });
 addLocaleData({ locale: "en-US", parentLocale: "en" });
 addLocaleData({ locale: "en-xa", pluralRuleFunction: function (n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"}, "fields":{"year":{"displayName":"ýéààŕ","relative":{"0":"ţĥîîš ýééàŕ","1":"ñéẋẋţ ýééàŕ","-1":"ļàššţ ýééàŕ"},"relativeTime":{"future":{"one":"îñ {0} ýýéàŕŕ","other":"îñ {0} ýýéàŕŕš"},"past":{"one":"{0} ýéààŕ àĝĝô","other":"{0} ýéààŕš ààĝô"}}},"year-short":{"displayName":"ýŕ.","relative":{"0":"ţĥîîš ýŕŕ.","1":"ñéẋẋţ ýŕŕ.","-1":"ļàššţ ýŕŕ."},"relativeTime":{"future":{"one":"îñ {0} ýýŕ.","other":"îñ {0} ýýŕ."},"past":{"one":"{0} ýŕ. ààĝô","other":"{0} ýŕ. ààĝô"}}},"month":{"displayName":"ɱôññţĥ","relative":{"0":"ţĥîîš ɱôôñţĥĥ","1":"ñéẋẋţ ɱôôñţĥĥ","-1":"ļàššţ ɱôôñţĥĥ"},"relativeTime":{"future":{"one":"îñ {0} ɱɱôñţţĥ","other":"îñ {0} ɱɱôñţţĥš"},"past":{"one":"{0} ɱôññţĥ ààĝô","other":"{0} ɱôññţĥšš àĝôô"}}},"month-short":{"displayName":"ɱô.","relative":{"0":"ţĥîîš ɱôô.","1":"ñéẋẋţ ɱôô.","-1":"ļàššţ ɱôô."},"relativeTime":{"future":{"one":"îñ {0} ɱɱô.","other":"îñ {0} ɱɱô."},"past":{"one":"{0} ɱô. ààĝô","other":"{0} ɱô. ààĝô"}}},"day":{"displayName":"ðàýý","relative":{"0":"ţôððàý","1":"ţôɱɱôŕŕŕôŵ","-1":"ýéššţéŕŕðàýý"},"relativeTime":{"future":{"one":"îñ {0} ððàý","other":"îñ {0} ððàýšš"},"past":{"one":"{0} ðàýý àĝôô","other":"{0} ðàýýš àĝĝô"}}},"day-short":{"displayName":"ðàýý","relative":{"0":"ţôððàý","1":"ţôɱɱôŕŕŕôŵ","-1":"ýéššţéŕŕðàýý"},"relativeTime":{"future":{"one":"îñ {0} ððàý","other":"îñ {0} ððàýšš"},"past":{"one":"{0} ðàýý àĝôô","other":"{0} ðàýýš àĝĝô"}}},"hour":{"displayName":"ĥôûûŕ","relative":{"0":"ţĥîîš ĥôôûŕ"},"relativeTime":{"future":{"one":"îñ {0} ĥĥôûŕŕ","other":"îñ {0} ĥĥôûŕŕš"},"past":{"one":"{0} ĥôûûŕ àĝĝô","other":"{0} ĥôûûŕš ààĝô"}}},"hour-short":{"displayName":"ĥŕ.","relative":{"0":"ţĥîîš ĥôôûŕ"},"relativeTime":{"future":{"one":"îñ {0} ĥĥŕ.","other":"îñ {0} ĥĥŕ."},"past":{"one":"{0} ĥŕ. ààĝô","other":"{0} ĥŕ. ààĝô"}}},"minute":{"displayName":"ɱîññûţéé","relative":{"0":"ţĥîîš ɱîîñûţţé"},"relativeTime":{"future":{"one":"îñ {0} ɱɱîñûûţé","other":"îñ {0} ɱɱîñûûţéšš"},"past":{"one":"{0} ɱîññûţéé àĝôô","other":"{0} ɱîññûţééš àĝĝô"}}},"minute-short":{"displayName":"ɱîññ.","relative":{"0":"ţĥîîš ɱîîñûţţé"},"relativeTime":{"future":{"one":"îñ {0} ɱɱîñ.","other":"îñ {0} ɱɱîñ."},"past":{"one":"{0} ɱîññ. àĝôô","other":"{0} ɱîññ. àĝôô"}}},"second":{"displayName":"šéççôñðð","relative":{"0":"ñôŵŵ"},"relativeTime":{"future":{"one":"îñ {0} ššéçôôñð","other":"îñ {0} ššéçôôñðšš"},"past":{"one":"{0} šéççôñðð àĝôô","other":"{0} šéççôñððš àĝĝô"}}},"second-short":{"displayName":"šéçç.","relative":{"0":"ñôŵŵ"},"relativeTime":{"future":{"one":"îñ {0} ššéç.","other":"îñ {0} ššéç."},"past":{"one":"{0} šéçç. àĝôô","other":"{0} šéçç. àĝôô"}}}} });
 addLocaleData({ locale: "es", pluralRuleFunction: function (n,ord){if(ord)return"other";return n==1?"one":"other"},"fields":{"year":{"displayName":"año","relative":{"0":"este año","1":"el próximo año","-1":"el año pasado"},"relativeTime":{"future":{"one":"dentro de {0} año","other":"dentro de {0} años"},"past":{"one":"hace {0} año","other":"hace {0} años"}}},"year-short":{"displayName":"a","relative":{"0":"este año","1":"el próximo año","-1":"el año pasado"},"relativeTime":{"future":{"one":"dentro de {0} a","other":"dentro de {0} a"},"past":{"one":"hace {0} a","other":"hace {0} a"}}},"month":{"displayName":"mes","relative":{"0":"este mes","1":"el próximo mes","-1":"el mes pasado"},"relativeTime":{"future":{"one":"dentro de {0} mes","other":"dentro de {0} meses"},"past":{"one":"hace {0} mes","other":"hace {0} meses"}}},"month-short":{"displayName":"m","relative":{"0":"este mes","1":"el próximo mes","-1":"el mes pasado"},"relativeTime":{"future":{"one":"dentro de {0} m","other":"dentro de {0} m"},"past":{"one":"hace {0} m","other":"hace {0} m"}}},"day":{"displayName":"día","relative":{"0":"hoy","1":"mañana","2":"pasado mañana","-2":"anteayer","-1":"ayer"},"relativeTime":{"future":{"one":"dentro de {0} día","other":"dentro de {0} días"},"past":{"one":"hace {0} día","other":"hace {0} días"}}},"day-short":{"displayName":"d","relative":{"0":"hoy","1":"mañana","2":"pasado mañana","-2":"anteayer","-1":"ayer"},"relativeTime":{"future":{"one":"dentro de {0} día","other":"dentro de {0} días"},"past":{"one":"hace {0} día","other":"hace {0} días"}}},"hour":{"displayName":"hora","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"dentro de {0} hora","other":"dentro de {0} horas"},"past":{"one":"hace {0} hora","other":"hace {0} horas"}}},"hour-short":{"displayName":"h","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"dentro de {0} h","other":"dentro de {0} h"},"past":{"one":"hace {0} h","other":"hace {0} h"}}},"minute":{"displayName":"minuto","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"dentro de {0} minuto","other":"dentro de {0} minutos"},"past":{"one":"hace {0} minuto","other":"hace {0} minutos"}}},"minute-short":{"displayName":"min","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"dentro de {0} min","other":"dentro de {0} min"},"past":{"one":"hace {0} min","other":"hace {0} min"}}},"second":{"displayName":"segundo","relative":{"0":"ahora"},"relativeTime":{"future":{"one":"dentro de {0} segundo","other":"dentro de {0} segundos"},"past":{"one":"hace {0} segundo","other":"hace {0} segundos"}}},"second-short":{"displayName":"s","relative":{"0":"ahora"},"relativeTime":{"future":{"one":"dentro de {0} s","other":"dentro de {0} s"},"past":{"one":"hace {0} s","other":"hace {0} s"}}}} });
+addLocaleData({ locale: "es-419", parentLocale: "es", "fields":{"year":{"displayName":"año","relative":{"0":"este año","1":"el próximo año","-1":"el año pasado"},"relativeTime":{"future":{"one":"dentro de {0} año","other":"dentro de {0} años"},"past":{"one":"hace {0} año","other":"hace {0} años"}}},"year-short":{"displayName":"a","relative":{"0":"este año","1":"el próximo año","-1":"el año pasado"},"relativeTime":{"future":{"one":"dentro de {0} a","other":"dentro de {0} a"},"past":{"one":"hace {0} a","other":"hace {0} a"}}},"month":{"displayName":"mes","relative":{"0":"este mes","1":"el próximo mes","-1":"el mes pasado"},"relativeTime":{"future":{"one":"dentro de {0} mes","other":"dentro de {0} meses"},"past":{"one":"hace {0} mes","other":"hace {0} meses"}}},"month-short":{"displayName":"m","relative":{"0":"este mes","1":"el próximo mes","-1":"el mes pasado"},"relativeTime":{"future":{"one":"dentro de {0} m","other":"dentro de {0} m"},"past":{"one":"hace {0} m","other":"hace {0} m"}}},"week":{"displayName":"semana","relativePeriod":"la semana del {0}","relative":{"0":"esta semana","1":"la próxima semana","-1":"la semana pasada"},"relativeTime":{"future":{"one":"dentro de {0} semana","other":"dentro de {0} semanas"},"past":{"one":"hace {0} semana","other":"hace {0} semanas"}}},"week-short":{"displayName":"sem.","relativePeriod":"la semana del {0}","relative":{"0":"esta semana","1":"la próxima semana","-1":"la semana pasada"},"relativeTime":{"future":{"one":"dentro de {0} sem.","other":"dentro de {0} sem."},"past":{"one":"hace {0} sem.","other":"hace {0} sem."}}},"day":{"displayName":"día","relative":{"0":"hoy","1":"mañana","2":"pasado mañana","-2":"anteayer","-1":"ayer"},"relativeTime":{"future":{"one":"dentro de {0} día","other":"dentro de {0} días"},"past":{"one":"hace {0} día","other":"hace {0} días"}}},"day-short":{"displayName":"d","relative":{"0":"hoy","1":"mañana","2":"pasado mañana","-2":"anteayer","-1":"ayer"},"relativeTime":{"future":{"one":"dentro de {0} día","other":"dentro de {0} días"},"past":{"one":"hace {0} día","other":"hace {0} días"}}},"hour":{"displayName":"hora","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"dentro de {0} hora","other":"dentro de {0} horas"},"past":{"one":"hace {0} hora","other":"hace {0} horas"}}},"hour-short":{"displayName":"h","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"dentro de {0} h","other":"dentro de {0} h"},"past":{"one":"hace {0} h","other":"hace {0} h"}}},"minute":{"displayName":"minuto","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"dentro de {0} minuto","other":"dentro de {0} minutos"},"past":{"one":"hace {0} minuto","other":"hace {0} minutos"}}},"minute-short":{"displayName":"min","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"dentro de {0} min","other":"dentro de {0} min"},"past":{"one":"hace {0} min","other":"hace {0} min"}}},"second":{"displayName":"segundo","relative":{"0":"ahora"},"relativeTime":{"future":{"one":"dentro de {0} segundo","other":"dentro de {0} segundos"},"past":{"one":"hace {0} segundo","other":"hace {0} segundos"}}},"second-short":{"displayName":"s","relative":{"0":"ahora"},"relativeTime":{"future":{"one":"dentro de {0} s","other":"dentro de {0} s"},"past":{"one":"hace {0} s","other":"hace {0} s"}}}}});
+addLocaleData({ locale: "es-ES", parentLocale: "es" });
 addLocaleData({ locale: "es-LA", parentLocale: "es" });
 addLocaleData({ locale: "fr", pluralRuleFunction: function (n,ord){if(ord)return n==1?"one":"other";return n>=0&&n<2?"one":"other"},"fields":{"year":{"displayName":"année","relative":{"0":"cette année","1":"l’année prochaine","-1":"l’année dernière"},"relativeTime":{"future":{"one":"dans {0} an","other":"dans {0} ans"},"past":{"one":"il y a {0} an","other":"il y a {0} ans"}}},"year-short":{"displayName":"an","relative":{"0":"cette année","1":"l’année prochaine","-1":"l’année dernière"},"relativeTime":{"future":{"one":"dans {0} a","other":"dans {0} a"},"past":{"one":"il y a {0} a","other":"il y a {0} a"}}},"month":{"displayName":"mois","relative":{"0":"ce mois-ci","1":"le mois prochain","-1":"le mois dernier"},"relativeTime":{"future":{"one":"dans {0} mois","other":"dans {0} mois"},"past":{"one":"il y a {0} mois","other":"il y a {0} mois"}}},"month-short":{"displayName":"m.","relative":{"0":"ce mois-ci","1":"le mois prochain","-1":"le mois dernier"},"relativeTime":{"future":{"one":"dans {0} m.","other":"dans {0} m."},"past":{"one":"il y a {0} m.","other":"il y a {0} m."}}},"day":{"displayName":"jour","relative":{"0":"aujourd’hui","1":"demain","2":"après-demain","-2":"avant-hier","-1":"hier"},"relativeTime":{"future":{"one":"dans {0} jour","other":"dans {0} jours"},"past":{"one":"il y a {0} jour","other":"il y a {0} jours"}}},"day-short":{"displayName":"j","relative":{"0":"aujourd’hui","1":"demain","2":"après-demain","-2":"avant-hier","-1":"hier"},"relativeTime":{"future":{"one":"dans {0} j","other":"dans {0} j"},"past":{"one":"il y a {0} j","other":"il y a {0} j"}}},"hour":{"displayName":"heure","relative":{"0":"cette heure-ci"},"relativeTime":{"future":{"one":"dans {0} heure","other":"dans {0} heures"},"past":{"one":"il y a {0} heure","other":"il y a {0} heures"}}},"hour-short":{"displayName":"h","relative":{"0":"cette heure-ci"},"relativeTime":{"future":{"one":"dans {0} h","other":"dans {0} h"},"past":{"one":"il y a {0} h","other":"il y a {0} h"}}},"minute":{"displayName":"minute","relative":{"0":"cette minute-ci"},"relativeTime":{"future":{"one":"dans {0} minute","other":"dans {0} minutes"},"past":{"one":"il y a {0} minute","other":"il y a {0} minutes"}}},"minute-short":{"displayName":"min","relative":{"0":"cette minute-ci"},"relativeTime":{"future":{"one":"dans {0} min","other":"dans {0} min"},"past":{"one":"il y a {0} min","other":"il y a {0} min"}}},"second":{"displayName":"seconde","relative":{"0":"maintenant"},"relativeTime":{"future":{"one":"dans {0} seconde","other":"dans {0} secondes"},"past":{"one":"il y a {0} seconde","other":"il y a {0} secondes"}}},"second-short":{"displayName":"s","relative":{"0":"maintenant"},"relativeTime":{"future":{"one":"dans {0} s","other":"dans {0} s"},"past":{"one":"il y a {0} s","other":"il y a {0} s"}}}} });
+addLocaleData({ locale: "fr-CA", parentLocale: "fr", "fields":{"year":{"displayName":"année","relative":{"0":"cette année","1":"l’année prochaine","-1":"l’année dernière"},"relativeTime":{"future":{"one":"Dans {0} an","other":"Dans {0} ans"},"past":{"one":"Il y a {0} an","other":"Il y a {0} ans"}}},"year-short":{"displayName":"a","relative":{"0":"cette année","1":"l’année prochaine","-1":"l’année dernière"},"relativeTime":{"future":{"one":"dans {0} a","other":"dans {0} a"},"past":{"one":"il y a {0} a","other":"il y a {0} a"}}},"month":{"displayName":"mois","relative":{"0":"ce mois-ci","1":"le mois prochain","-1":"le mois dernier"},"relativeTime":{"future":{"one":"dans {0} mois","other":"dans {0} mois"},"past":{"one":"il y a {0} mois","other":"il y a {0} mois"}}},"month-short":{"displayName":"m.","relative":{"0":"ce mois-ci","1":"le mois prochain","-1":"le mois dernier"},"relativeTime":{"future":{"one":"dans {0} m.","other":"dans {0} m."},"past":{"one":"il y a {0} m.","other":"il y a {0} m."}}},"week":{"displayName":"semaine","relativePeriod":"la semaine du {0}","relative":{"0":"cette semaine","1":"la semaine prochaine","-1":"la semaine dernière"},"relativeTime":{"future":{"one":"dans {0} semaine","other":"dans {0} semaines"},"past":{"one":"il y a {0} semaine","other":"il y a {0} semaines"}}},"week-short":{"displayName":"sem.","relativePeriod":"sem. du {0}","relative":{"0":"cette semaine","1":"la semaine prochaine","-1":"la semaine dernière"},"relativeTime":{"future":{"one":"dans {0} sem.","other":"dans {0} sem."},"past":{"one":"il y a {0} sem.","other":"il y a {0} sem."}}},"day":{"displayName":"jour","relative":{"0":"aujourd’hui","1":"demain","2":"après-demain","-2":"avant-hier","-1":"hier"},"relativeTime":{"future":{"one":"dans {0} jour","other":"dans {0} jours"},"past":{"one":"il y a {0} jour","other":"il y a {0} jours"}}},"day-short":{"displayName":"j","relative":{"0":"aujourd’hui","1":"demain","2":"après-demain","-2":"avant-hier","-1":"hier"},"relativeTime":{"future":{"one":"dans {0} j","other":"dans {0} j"},"past":{"one":"il y a {0} j","other":"il y a {0} j"}}},"hour":{"displayName":"heure","relative":{"0":"cette heure-ci"},"relativeTime":{"future":{"one":"dans {0} heure","other":"dans {0} heures"},"past":{"one":"il y a {0} heure","other":"il y a {0} heures"}}},"hour-short":{"displayName":"h","relative":{"0":"cette heure-ci"},"relativeTime":{"future":{"one":"dans {0} h","other":"dans {0} h"},"past":{"one":"il y a {0} h","other":"il y a {0} h"}}},"minute":{"displayName":"minute","relative":{"0":"cette minute-ci"},"relativeTime":{"future":{"one":"dans {0} minute","other":"dans {0} minutes"},"past":{"one":"il y a {0} minute","other":"il y a {0} minutes"}}},"minute-short":{"displayName":"min","relative":{"0":"cette minute-ci"},"relativeTime":{"future":{"one":"dans {0} min","other":"dans {0} min"},"past":{"one":"il y a {0} min","other":"il y a {0} min"}}},"second":{"displayName":"seconde","relative":{"0":"maintenant"},"relativeTime":{"future":{"one":"dans {0} seconde","other":"dans {0} secondes"},"past":{"one":"il y a {0} seconde","other":"il y a {0} secondes"}}},"second-short":{"displayName":"s","relative":{"0":"maintenant"},"relativeTime":{"future":{"one":"dans {0} s","other":"dans {0} s"},"past":{"one":"il y a {0} s","other":"il y a {0} s"}}}}});
 addLocaleData({ locale: "fr-FR", parentLocale: "fr" });
-addLocaleData({ locale: "de", pluralRuleFunction: function (n,ord){var s=String(n).split("."),v0=!s[1];if(ord)return"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"Jahr","relative":{"0":"dieses Jahr","1":"nächstes Jahr","-1":"letztes Jahr"},"relativeTime":{"future":{"one":"in {0} Jahr","other":"in {0} Jahren"},"past":{"one":"vor {0} Jahr","other":"vor {0} Jahren"}}},"year-short":{"displayName":"Jahr","relative":{"0":"dieses Jahr","1":"nächstes Jahr","-1":"letztes Jahr"},"relativeTime":{"future":{"one":"in {0} Jahr","other":"in {0} Jahren"},"past":{"one":"vor {0} Jahr","other":"vor {0} Jahren"}}},"month":{"displayName":"Monat","relative":{"0":"diesen Monat","1":"nächsten Monat","-1":"letzten Monat"},"relativeTime":{"future":{"one":"in {0} Monat","other":"in {0} Monaten"},"past":{"one":"vor {0} Monat","other":"vor {0} Monaten"}}},"month-short":{"displayName":"Monat","relative":{"0":"diesen Monat","1":"nächsten Monat","-1":"letzten Monat"},"relativeTime":{"future":{"one":"in {0} Monat","other":"in {0} Monaten"},"past":{"one":"vor {0} Monat","other":"vor {0} Monaten"}}},"day":{"displayName":"Tag","relative":{"0":"heute","1":"morgen","2":"übermorgen","-2":"vorgestern","-1":"gestern"},"relativeTime":{"future":{"one":"in {0} Tag","other":"in {0} Tagen"},"past":{"one":"vor {0} Tag","other":"vor {0} Tagen"}}},"day-short":{"displayName":"Tag","relative":{"0":"heute","1":"morgen","2":"übermorgen","-2":"vorgestern","-1":"gestern"},"relativeTime":{"future":{"one":"in {0} Tag","other":"in {0} Tagen"},"past":{"one":"vor {0} Tag","other":"vor {0} Tagen"}}},"hour":{"displayName":"Stunde","relative":{"0":"in dieser Stunde"},"relativeTime":{"future":{"one":"in {0} Stunde","other":"in {0} Stunden"},"past":{"one":"vor {0} Stunde","other":"vor {0} Stunden"}}},"hour-short":{"displayName":"Std.","relative":{"0":"in dieser Stunde"},"relativeTime":{"future":{"one":"in {0} Std.","other":"in {0} Std."},"past":{"one":"vor {0} Std.","other":"vor {0} Std."}}},"minute":{"displayName":"Minute","relative":{"0":"in dieser Minute"},"relativeTime":{"future":{"one":"in {0} Minute","other":"in {0} Minuten"},"past":{"one":"vor {0} Minute","other":"vor {0} Minuten"}}},"minute-short":{"displayName":"Min.","relative":{"0":"in dieser Minute"},"relativeTime":{"future":{"one":"in {0} Min.","other":"in {0} Min."},"past":{"one":"vor {0} Min.","other":"vor {0} Min."}}},"second":{"displayName":"Sekunde","relative":{"0":"jetzt"},"relativeTime":{"future":{"one":"in {0} Sekunde","other":"in {0} Sekunden"},"past":{"one":"vor {0} Sekunde","other":"vor {0} Sekunden"}}},"second-short":{"displayName":"Sek.","relative":{"0":"jetzt"},"relativeTime":{"future":{"one":"in {0} Sek.","other":"in {0} Sek."},"past":{"one":"vor {0} Sek.","other":"vor {0} Sek."}}}} });
-addLocaleData({ locale: "de-DE", parentLocale: "de" });
+addLocaleData({ locale: "id", pluralRuleFunction: function (n, ord) {if (ord) return 'other';return 'other';},"fields":{"year":{"displayName":"tahun","relative":{"0":"tahun ini","1":"tahun depan","-1":"tahun lalu"},"relativeTime":{"future":{"other":"dalam {0} tahun"},"past":{"other":"{0} tahun yang lalu"}}},"year-short":{"displayName":"thn.","relative":{"0":"tahun ini","1":"tahun depan","-1":"tahun lalu"},"relativeTime":{"future":{"other":"dlm {0} thn"},"past":{"other":"{0} thn lalu"}}},"month":{"displayName":"bulan","relative":{"0":"bulan ini","1":"bulan berikutnya","-1":"bulan lalu"},"relativeTime":{"future":{"other":"dalam {0} bulan"},"past":{"other":"{0} bulan yang lalu"}}},"month-short":{"displayName":"bln.","relative":{"0":"bulan ini","1":"bulan berikutnya","-1":"bulan lalu"},"relativeTime":{"future":{"other":"dlm {0} bln"},"past":{"other":"{0} bln lalu"}}},"week":{"displayName":"minggu","relativePeriod":"minggu ke-{0}","relative":{"0":"minggu ini","1":"minggu depan","-1":"minggu lalu"},"relativeTime":{"future":{"other":"dalam {0} minggu"},"past":{"other":"{0} minggu yang lalu"}}},"week-short":{"displayName":"mgg.","relativePeriod":"mgg ke-{0}","relative":{"0":"minggu ini","1":"minggu depan","-1":"minggu lalu"},"relativeTime":{"future":{"other":"dlm {0} mgg"},"past":{"other":"{0} mgg lalu"}}},"day":{"displayName":"hari","relative":{"0":"hari ini","1":"besok","2":"lusa","-2":"kemarin dulu","-1":"kemarin"},"relativeTime":{"future":{"other":"dalam {0} hari"},"past":{"other":"{0} hari yang lalu"}}},"day-short":{"displayName":"h","relative":{"0":"hari ini","1":"besok","2":"lusa","-2":"kemarin dulu","-1":"kemarin"},"relativeTime":{"future":{"other":"dalam {0} h"},"past":{"other":"{0} h lalu"}}},"hour":{"displayName":"Jam","relative":{"0":"jam ini"},"relativeTime":{"future":{"other":"dalam {0} jam"},"past":{"other":"{0} jam yang lalu"}}},"hour-short":{"displayName":"jam","relative":{"0":"jam ini"},"relativeTime":{"future":{"other":"dalam {0} jam"},"past":{"other":"{0} jam lalu"}}},"minute":{"displayName":"menit","relative":{"0":"menit ini"},"relativeTime":{"future":{"other":"dalam {0} menit"},"past":{"other":"{0} menit yang lalu"}}},"minute-short":{"displayName":"mnt.","relative":{"0":"menit ini"},"relativeTime":{"future":{"other":"dlm {0} mnt"},"past":{"other":"{0} mnt lalu"}}},"second":{"displayName":"detik","relative":{"0":"sekarang"},"relativeTime":{"future":{"other":"dalam {0} detik"},"past":{"other":"{0} detik yang lalu"}}},"second-short":{"displayName":"dtk.","relative":{"0":"sekarang"},"relativeTime":{"future":{"other":"dlm {0} dtk"},"past":{"other":"{0} dtk lalu"}}}}});
+addLocaleData({ locale: "id-ID", parentLocale: "id" });
+addLocaleData({ locale: "it", pluralRuleFunction: function(n, ord) {var s=String(n).split('.'),v0=!s[1];if (ord) return ((n == 11 || n == 8 || n == 80 || n == 800)) ? 'many' : 'other';return (n == 1 && v0) ? 'one' : 'other';},"fields":{"year":{"displayName":"anno","relative":{"0":"quest’anno","1":"anno prossimo","-1":"anno scorso"},"relativeTime":{"future":{"one":"tra {0} anno","other":"tra {0} anni"},"past":{"one":"{0} anno fa","other":"{0} anni fa"}}},"year-short":{"displayName":"anno","relative":{"0":"quest’anno","1":"anno prossimo","-1":"anno scorso"},"relativeTime":{"future":{"one":"tra {0} anno","other":"tra {0} anni"},"past":{"one":"{0} anno fa","other":"{0} anni fa"}}},"month":{"displayName":"mese","relative":{"0":"questo mese","1":"mese prossimo","-1":"mese scorso"},"relativeTime":{"future":{"one":"tra {0} mese","other":"tra {0} mesi"},"past":{"one":"{0} mese fa","other":"{0} mesi fa"}}},"month-short":{"displayName":"mese","relative":{"0":"questo mese","1":"mese prossimo","-1":"mese scorso"},"relativeTime":{"future":{"one":"tra {0} mese","other":"tra {0} mesi"},"past":{"one":"{0} mese fa","other":"{0} mesi fa"}}},"week":{"displayName":"settimana","relativePeriod":"la settimana del {0}","relative":{"0":"questa settimana","1":"settimana prossima","-1":"settimana scorsa"},"relativeTime":{"future":{"one":"tra {0} settimana","other":"tra {0} settimane"},"past":{"one":"{0} settimana fa","other":"{0} settimane fa"}}},"week-short":{"displayName":"sett.","relativePeriod":"la settimana del {0}","relative":{"0":"questa settimana","1":"settimana prossima","-1":"settimana scorsa"},"relativeTime":{"future":{"one":"tra {0} sett.","other":"tra {0} sett."},"past":{"one":"{0} sett. fa","other":"{0} sett. fa"}}},"day":{"displayName":"giorno","relative":{"0":"oggi","1":"domani","2":"dopodomani","-2":"l’altro ieri","-1":"ieri"},"relativeTime":{"future":{"one":"tra {0} giorno","other":"tra {0} giorni"},"past":{"one":"{0} giorno fa","other":"{0} giorni fa"}}},"day-short":{"displayName":"g","relative":{"0":"oggi","1":"domani","2":"dopodomani","-2":"l’altro ieri","-1":"ieri"},"relativeTime":{"future":{"one":"tra {0} g","other":"tra {0} gg"},"past":{"one":"{0} g fa","other":"{0} gg fa"}}},"hour":{"displayName":"ora","relative":{"0":"quest’ora"},"relativeTime":{"future":{"one":"tra {0} ora","other":"tra {0} ore"},"past":{"one":"{0} ora fa","other":"{0} ore fa"}}},"hour-short":{"displayName":"h.","relative":{"0":"quest’ora"},"relativeTime":{"future":{"one":"tra {0} h","other":"tra {0} h"},"past":{"one":"{0} h fa","other":"{0} h fa"}}},"minute":{"displayName":"minuto","relative":{"0":"questo minuto"},"relativeTime":{"future":{"one":"tra {0} minuto","other":"tra {0} minuti"},"past":{"one":"{0} minuto fa","other":"{0} minuti fa"}}},"minute-short":{"displayName":"min","relative":{"0":"questo minuto"},"relativeTime":{"future":{"one":"tra {0} min","other":"tra {0} min"},"past":{"one":"{0} min fa","other":"{0} min fa"}}},"second":{"displayName":"secondo","relative":{"0":"ora"},"relativeTime":{"future":{"one":"tra {0} secondo","other":"tra {0} secondi"},"past":{"one":"{0} secondo fa","other":"{0} secondi fa"}}},"second-short":{"displayName":"s","relative":{"0":"ora"},"relativeTime":{"future":{"one":"tra {0} s","other":"tra {0} sec."},"past":{"one":"{0} s fa","other":"{0} sec. fa"}}}}});
+addLocaleData({ locale: "it-CH", parentLocale: "it" });
+addLocaleData({ locale: "it-IT", parentLocale: "it" });
+addLocaleData({ locale: "it-SM", parentLocale: "it" });
+addLocaleData({ locale: "it-VA", parentLocale: "it" });
 addLocaleData({ locale: "ja", pluralRuleFunction: function (n,ord){if(ord)return"other";return"other"},"fields":{"year":{"displayName":"年","relative":{"0":"今年","1":"翌年","-1":"昨年"},"relativeTime":{"future":{"other":"{0} 年後"},"past":{"other":"{0} 年前"}}},"year-short":{"displayName":"年","relative":{"0":"今年","1":"翌年","-1":"昨年"},"relativeTime":{"future":{"other":"{0} 年後"},"past":{"other":"{0} 年前"}}},"month":{"displayName":"月","relative":{"0":"今月","1":"翌月","-1":"先月"},"relativeTime":{"future":{"other":"{0} か月後"},"past":{"other":"{0} か月前"}}},"month-short":{"displayName":"月","relative":{"0":"今月","1":"翌月","-1":"先月"},"relativeTime":{"future":{"other":"{0} か月後"},"past":{"other":"{0} か月前"}}},"day":{"displayName":"日","relative":{"0":"今日","1":"明日","2":"明後日","-2":"一昨日","-1":"昨日"},"relativeTime":{"future":{"other":"{0} 日後"},"past":{"other":"{0} 日前"}}},"day-short":{"displayName":"日","relative":{"0":"今日","1":"明日","2":"明後日","-2":"一昨日","-1":"昨日"},"relativeTime":{"future":{"other":"{0} 日後"},"past":{"other":"{0} 日前"}}},"hour":{"displayName":"時","relative":{"0":"1 時間以内"},"relativeTime":{"future":{"other":"{0} 時間後"},"past":{"other":"{0} 時間前"}}},"hour-short":{"displayName":"時","relative":{"0":"1 時間以内"},"relativeTime":{"future":{"other":"{0} 時間後"},"past":{"other":"{0} 時間前"}}},"minute":{"displayName":"分","relative":{"0":"1 分以内"},"relativeTime":{"future":{"other":"{0} 分後"},"past":{"other":"{0} 分前"}}},"minute-short":{"displayName":"分","relative":{"0":"1 分以内"},"relativeTime":{"future":{"other":"{0} 分後"},"past":{"other":"{0} 分前"}}},"second":{"displayName":"秒","relative":{"0":"今"},"relativeTime":{"future":{"other":"{0} 秒後"},"past":{"other":"{0} 秒前"}}},"second-short":{"displayName":"秒","relative":{"0":"今"},"relativeTime":{"future":{"other":"{0} 秒後"},"past":{"other":"{0} 秒前"}}}} });
 addLocaleData({ locale: "ja-JP", parentLocale: "ja" });
 addLocaleData({ locale: "ko", pluralRuleFunction: function (n,ord){if(ord)return"other";return"other"},"fields":{"year":{"displayName":"년","relative":{"0":"올해","1":"내년","-1":"작년"},"relativeTime":{"future":{"other":"{0}년 후"},"past":{"other":"{0}년 전"}}},"year-short":{"displayName":"년","relative":{"0":"올해","1":"내년","-1":"작년"},"relativeTime":{"future":{"other":"{0}년 후"},"past":{"other":"{0}년 전"}}},"month":{"displayName":"월","relative":{"0":"이번 달","1":"다음 달","-1":"지난달"},"relativeTime":{"future":{"other":"{0}개월 후"},"past":{"other":"{0}개월 전"}}},"month-short":{"displayName":"월","relative":{"0":"이번 달","1":"다음 달","-1":"지난달"},"relativeTime":{"future":{"other":"{0}개월 후"},"past":{"other":"{0}개월 전"}}},"day":{"displayName":"일","relative":{"0":"오늘","1":"내일","2":"모레","-2":"그저께","-1":"어제"},"relativeTime":{"future":{"other":"{0}일 후"},"past":{"other":"{0}일 전"}}},"day-short":{"displayName":"일","relative":{"0":"오늘","1":"내일","2":"모레","-2":"그저께","-1":"어제"},"relativeTime":{"future":{"other":"{0}일 후"},"past":{"other":"{0}일 전"}}},"hour":{"displayName":"시","relative":{"0":"현재 시간"},"relativeTime":{"future":{"other":"{0}시간 후"},"past":{"other":"{0}시간 전"}}},"hour-short":{"displayName":"시","relative":{"0":"현재 시간"},"relativeTime":{"future":{"other":"{0}시간 후"},"past":{"other":"{0}시간 전"}}},"minute":{"displayName":"분","relative":{"0":"현재 분"},"relativeTime":{"future":{"other":"{0}분 후"},"past":{"other":"{0}분 전"}}},"minute-short":{"displayName":"분","relative":{"0":"현재 분"},"relativeTime":{"future":{"other":"{0}분 후"},"past":{"other":"{0}분 전"}}},"second":{"displayName":"초","relative":{"0":"지금"},"relativeTime":{"future":{"other":"{0}초 후"},"past":{"other":"{0}초 전"}}},"second-short":{"displayName":"초","relative":{"0":"지금"},"relativeTime":{"future":{"other":"{0}초 후"},"past":{"other":"{0}초 전"}}}} });
 addLocaleData({ locale: "ko-KR", parentLocale: "ko" });
-addLocaleData({ locale: 'ru', pluralRuleFunction: function (n,ord){var s=String(n).split("."),i=s[0],v0=!s[1],i10=i.slice(-1),i100=i.slice(-2);if(ord)return"other";return v0&&i10==1&&i100!=11?"one":v0&&i10>=2&&i10<=4&&(i100<12||i100>14)?"few":(v0&&i10==0)||(v0&&i10>=5&&i10<=9)||(v0&&i100>=11&&i100<=14)?"many":"other";},"fields":{"year":{"displayName":"год","relative":{"0":"в этом году","1":"в следующем году","-1":"в прошлом году"},"relativeTime":{"future":{"one":"через {0} год","few":"через {0} года","many":"через {0} лет","other":"через {0} года"},"past":{"one":"{0} год назад","few":"{0} года назад","many":"{0} лет назад","other":"{0} года назад"}}},"year-short":{"displayName":"г.","relative":{"0":"в этом г.","1":"в след. г.","-1":"в прошлом г."},"relativeTime":{"future":{"one":"через {0} г.","few":"через {0} г.","many":"через {0} л.","other":"через {0} г."},"past":{"one":"{0} г. назад","few":"{0} г. назад","many":"{0} л. назад","other":"{0} г. назад"}}},"month":{"displayName":"месяц","relative":{"0":"в этом месяце","1":"в следующем месяце","-1":"в прошлом месяце"},"relativeTime":{"future":{"one":"через {0} месяц","few":"через {0} месяца","many":"через {0} месяцев","other":"через {0} месяца"},"past":{"one":"{0} месяц назад","few":"{0} месяца назад","many":"{0} месяцев назад","other":"{0} месяца назад"}}},"month-short":{"displayName":"мес.","relative":{"0":"в этом мес.","1":"в следующем мес.","-1":"в прошлом мес."},"relativeTime":{"future":{"one":"через {0} мес.","few":"через {0} мес.","many":"через {0} мес.","other":"через {0} мес."},"past":{"one":"{0} мес. назад","few":"{0} мес. назад","many":"{0} мес. назад","other":"{0} мес. назад"}}},"week":{"displayName":"неделя","relativePeriod":"на неделе {0}","relative":{"0":"на этой неделе","1":"на следующей неделе","-1":"на прошлой неделе"},"relativeTime":{"future":{"one":"через {0} неделю","few":"через {0} недели","many":"через {0} недель","other":"через {0} недели"},"past":{"one":"{0} неделю назад","few":"{0} недели назад","many":"{0} недель назад","other":"{0} недели назад"}}},"week-short":{"displayName":"нед.","relativePeriod":"на нед. {0}","relative":{"0":"на этой нед.","1":"на следующей нед.","-1":"на прошлой нед."},"relativeTime":{"future":{"one":"через {0} нед.","few":"через {0} нед.","many":"через {0} нед.","other":"через {0} нед."},"past":{"one":"{0} нед. назад","few":"{0} нед. назад","many":"{0} нед. назад","other":"{0} нед. назад"}}},"day":{"displayName":"день","relative":{"0":"сегодня","1":"завтра","2":"послезавтра","-1":"вчера","-2":"позавчера"},"relativeTime":{"future":{"one":"через {0} день","few":"через {0} дня","many":"через {0} дней","other":"через {0} дня"},"past":{"one":"{0} день назад","few":"{0} дня назад","many":"{0} дней назад","other":"{0} дня назад"}}},"day-short":{"displayName":"дн.","relative":{"0":"сегодня","1":"завтра","2":"послезавтра","-1":"вчера","-2":"позавчера"},"relativeTime":{"future":{"one":"через {0} дн.","few":"через {0} дн.","many":"через {0} дн.","other":"через {0} дн."},"past":{"one":"{0} дн. назад","few":"{0} дн. назад","many":"{0} дн. назад","other":"{0} дн. назад"}}},"hour":{"displayName":"час","relative":{"0":"в этот час"},"relativeTime":{"future":{"one":"через {0} час","few":"через {0} часа","many":"через {0} часов","other":"через {0} часа"},"past":{"one":"{0} час назад","few":"{0} часа назад","many":"{0} часов назад","other":"{0} часа назад"}}},"hour-short":{"displayName":"ч","relative":{"0":"в этот час"},"relativeTime":{"future":{"one":"через {0} ч.","few":"через {0} ч.","many":"через {0} ч.","other":"через {0} ч."},"past":{"one":"{0} ч. назад","few":"{0} ч. назад","many":"{0} ч. назад","other":"{0} ч. назад"}}},"minute":{"displayName":"минута","relative":{"0":"в эту минуту"},"relativeTime":{"future":{"one":"через {0} минуту","few":"через {0} минуты","many":"через {0} минут","other":"через {0} минуты"},"past":{"one":"{0} минуту назад","few":"{0} минуты назад","many":"{0} минут назад","other":"{0} минуты назад"}}},"minute-short":{"displayName":"мин.","relative":{"0":"в эту минуту"},"relativeTime":{"future":{"one":"через {0} мин.","few":"через {0} мин.","many":"через {0} мин.","other":"через {0} мин."},"past":{"one":"{0} мин. назад","few":"{0} мин. назад","many":"{0} мин. назад","other":"{0} мин. назад"}}},"second":{"displayName":"секунда","relative":{"0":"сейчас"},"relativeTime":{"future":{"one":"через {0} секунду","few":"через {0} секунды","many":"через {0} секунд","other":"через {0} секунды"},"past":{"one":"{0} секунду назад","few":"{0} секунды назад","many":"{0} секунд назад","other":"{0} секунды назад"}}},"second-short":{"displayName":"сек.","relative":{"0":"сейчас"},"relativeTime":{"future":{"one":"через {0} сек.","few":"через {0} сек.","many":"через {0} сек.","other":"через {0} сек."},"past":{"one":"{0} сек. назад","few":"{0} сек. назад","many":"{0} сек. назад","other":"{0} сек. назад"}}}} });
+addLocaleData({ locale: "pl", pluralRuleFunction: function (n, ord) { var s = String(n).split("."), v0 = !s[1], t0 = Number(s[0]) == n, n10 = t0 && s[0].slice(-1), n100 = t0 && s[0].slice(-2); if (ord) return n10 == 1 && n100 != 11 ? "jeden" : n10 == 2 && n100 != 12 ? "dwa" : n10 == 3 && n100 != 13 ? "kilka" : "inny"; return n == 1 && v0 ? "jeden" : "inny" }, "fields": { "rok": { "displayName": "rok", "relative": { "0": "ten rok", "1": "następny rok", "-1": "poprzedni rok" }, "relativeTime": { "future": { "jeden": "za {0} rok", "other": "za {0} lat" }, "past": { "jeden": "{0} rok temu", "other": "{0} lata temu" } } }, "year-short": { "displayName": "rok", "relative": { "0": "ten rok", "1": "następny rok", "-1": "poprzedni rok" }, "relativeTime": { "future": { "one": "za {0} r.", "other": "za {0} l." }, "past": { "one": "{0} r. temu", "other": "{0} l. temu" } } }, "month": { "displayName": "miesiąc", "relative": { "0": "ten miesiąc", "1": "następny miesiąc", "-1": "poprzedni miesiąc" }, "relativeTime": { "future": { "one": "w {0} miesiącu", "other": "w {0} miesiącach" }, "past": { "one": "{0} miesiąc temu", "other": "{0}  miesięcy temu" } } }, "month-short": { "displayName": "miesiąc", "relative": { "0": "ten miesiąc", "1": "następny miesiąc", "-1": "poprzedni miesiąc" }, "relativeTime": { "future": { "one": "z {0} miesiąc", "other": "za {0} miesięcy" }, "past": { "one": "{0} miesiąc temu", "other": "{0} miesięcy temu" } } }, "day": { "displayName": "dzień", "relative": { "0": "dzisiaj", "1": "jutro", "-1": "wczoraj" }, "relativeTime": { "future": { "one": "za {0} dzień", "other": "za {0} dni" }, "past": { "one": "{0} dzień temu", "other": "{0} dni temu" } } }, "day-short": { "displayName": "dzień", "relative": { "0": "dzisiaj", "1": "jutro", "-1": "wczoraj" }, "relativeTime": { "future": { "one": "za {0} dzień", "other": "za {0} dni" }, "past": { "one": "{0} dzień temu", "other": "{0} dni temu" } } }, "hour": { "displayName": "godzina", "relative": { "0": "ta godzina" }, "relativeTime": { "future": { "one": "za {0} godzinę", "other": "za {0} godzin" }, "past": { "one": "{0} godzina temu", "other": "{0} godzin temu" } } }, "hour-short": { "displayName": "godz.", "relative": { "0": "ta godzina" }, "relativeTime": { "future": { "one": "za {0} godz.", "other": "za {0} godz." }, "past": { "one": "{0} godz. temu", "other": "{0} godz. temu" } } }, "minute": { "displayName": "minuta", "relative": { "0": "ta minuta" }, "relativeTime": { "future": { "one": "za {0} minutę", "other": "za {0} minut" }, "past": { "one": "{0} minuta temu", "other": "{0} minut temu" } } }, "minute-short": { "displayName": "min.", "relative": { "0": "ta min." }, "relativeTime": { "future": { "one": "za {0} min.", "other": "za {0} min." }, "past": { "one": "{0} min. temu", "other": "{0} min. temu" } } }, "second": { "displayName": "sekunda", "relative": { "0": "teraz" }, "relativeTime": { "future": { "one": "za {0} sekundę", "other": "za {0} sekund" }, "past": { "one": "{0} sekundę temu", "other": "{0} sekund temu" } } }, "second-short": { "displayName": "sek.", "relative": { "0": "teraz" }, "relativeTime": { "future": { "one": "za {0} sek.", "other": "za {0} sek." }, "past": { "one": "{0} sek. temu", "other": "{0} sek. temu" } } } } });
+addLocaleData({ locale: "pl-PL", parentLocale: "pl" });
+addLocaleData({ locale: "pt", pluralRuleFunction: function (n, ord) {var s = String(n).split('.'), i = s[0];if (ord) return 'other';return ((i == 0 || i == 1)) ? 'one' : 'other';},"fields":{"year":{"displayName":"ano","relative":{"0":"este ano","1":"próximo ano","-1":"ano passado"},"relativeTime":{"future":{"one":"em {0} ano","other":"em {0} anos"},"past":{"one":"há {0} ano","other":"há {0} anos"}}},"year-short":{"displayName":"ano","relative":{"0":"este ano","1":"próximo ano","-1":"ano passado"},"relativeTime":{"future":{"one":"em {0} ano","other":"em {0} anos"},"past":{"one":"há {0} ano","other":"há {0} anos"}}},"month":{"displayName":"mês","relative":{"0":"este mês","1":"próximo mês","-1":"mês passado"},"relativeTime":{"future":{"one":"em {0} mês","other":"em {0} meses"},"past":{"one":"há {0} mês","other":"há {0} meses"}}},"month-short":{"displayName":"mês","relative":{"0":"este mês","1":"próximo mês","-1":"mês passado"},"relativeTime":{"future":{"one":"em {0} mês","other":"em {0} meses"},"past":{"one":"há {0} mês","other":"há {0} meses"}}},"week":{"displayName":"semana","relativePeriod":"a semana de {0}","relative":{"0":"esta semana","1":"próxima semana","-1":"semana passada"},"relativeTime":{"future":{"one":"em {0} semana","other":"em {0} semanas"},"past":{"one":"há {0} semana","other":"há {0} semanas"}}},"week-short":{"displayName":"sem.","relativePeriod":"a semana de {0}","relative":{"0":"esta semana","1":"próxima semana","-1":"semana passada"},"relativeTime":{"future":{"one":"em {0} sem.","other":"em {0} sem."},"past":{"one":"há {0} sem.","other":"há {0} sem."}}},"day":{"displayName":"dia","relative":{"0":"hoje","1":"amanhã","2":"depois de amanhã","-2":"anteontem","-1":"ontem"},"relativeTime":{"future":{"one":"em {0} dia","other":"em {0} dias"},"past":{"one":"há {0} dia","other":"há {0} dias"}}},"day-short":{"displayName":"dia","relative":{"0":"hoje","1":"amanhã","2":"depois de amanhã","-2":"anteontem","-1":"ontem"},"relativeTime":{"future":{"one":"em {0} dia","other":"em {0} dias"},"past":{"one":"há {0} dia","other":"há {0} dias"}}},"hour":{"displayName":"hora","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"em {0} hora","other":"em {0} horas"},"past":{"one":"há {0} hora","other":"há {0} horas"}}},"hour-short":{"displayName":"h","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"em {0} h","other":"em {0} h"},"past":{"one":"há {0} h","other":"há {0} h"}}},"minute":{"displayName":"minuto","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"em {0} minuto","other":"em {0} minutos"},"past":{"one":"há {0} minuto","other":"há {0} minutos"}}},"minute-short":{"displayName":"min.","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"em {0} min.","other":"em {0} min."},"past":{"one":"há {0} min.","other":"há {0} min."}}},"second":{"displayName":"segundo","relative":{"0":"agora"},"relativeTime":{"future":{"one":"em {0} segundo","other":"em {0} segundos"},"past":{"one":"há {0} segundo","other":"há {0} segundos"}}},"second-short":{"displayName":"seg.","relative":{"0":"agora"},"relativeTime":{"future":{"one":"em {0} seg.","other":"em {0} seg."},"past":{"one":"há {0} seg.","other":"há {0} seg."}}}}});
+addLocaleData({ locale: "pt-PT", parentLocale: "pt", pluralRuleFunction: function (n) {var s = String(n).split('.'), v0 = !s[1];return (n == 1 && v0) ? 'one' : 'other';},"fields":{"year":{"displayName":"ano","relative":{"0":"este ano","1":"próximo ano","-1":"ano passado"},"relativeTime":{"future":{"one":"dentro de {0} ano","other":"dentro de {0} anos"},"past":{"one":"há {0} ano","other":"há {0} anos"}}},"year-short":{"displayName":"ano","relative":{"0":"este ano","1":"próximo ano","-1":"ano passado"},"relativeTime":{"future":{"one":"dentro de {0} ano","other":"dentro de {0} anos"},"past":{"one":"há {0} ano","other":"há {0} anos"}}},"month":{"displayName":"mês","relative":{"0":"este mês","1":"próximo mês","-1":"mês passado"},"relativeTime":{"future":{"one":"dentro de {0} mês","other":"dentro de {0} meses"},"past":{"one":"há {0} mês","other":"há {0} meses"}}},"month-short":{"displayName":"mês","relative":{"0":"este mês","1":"próximo mês","-1":"mês passado"},"relativeTime":{"future":{"one":"dentro de {0} mês","other":"dentro de {0} meses"},"past":{"one":"há {0} mês","other":"há {0} meses"}}},"week":{"displayName":"semana","relativePeriod":"a semana de {0}","relative":{"0":"esta semana","1":"próxima semana","-1":"semana passada"},"relativeTime":{"future":{"one":"dentro de {0} semana","other":"dentro de {0} semanas"},"past":{"one":"há {0} semana","other":"há {0} semanas"}}},"week-short":{"displayName":"sem.","relativePeriod":"a sem. de {0}","relative":{"0":"esta semana","1":"próxima semana","-1":"semana passada"},"relativeTime":{"future":{"one":"dentro de {0} sem.","other":"dentro de {0} sem."},"past":{"one":"há {0} sem.","other":"há {0} sem."}}},"day":{"displayName":"dia","relative":{"0":"hoje","1":"amanhã","2":"depois de amanhã","-2":"anteontem","-1":"ontem"},"relativeTime":{"future":{"one":"dentro de {0} dia","other":"dentro de {0} dias"},"past":{"one":"há {0} dia","other":"há {0} dias"}}},"day-short":{"displayName":"dia","relative":{"0":"hoje","1":"amanhã","2":"depois de amanhã","-2":"anteontem","-1":"ontem"},"relativeTime":{"future":{"one":"dentro de {0} dia","other":"dentro de {0} dias"},"past":{"one":"há {0} dia","other":"há {0} dias"}}},"hour":{"displayName":"hora","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"dentro de {0} hora","other":"dentro de {0} horas"},"past":{"one":"há {0} hora","other":"há {0} horas"}}},"hour-short":{"displayName":"h","relative":{"0":"esta hora"},"relativeTime":{"future":{"one":"dentro de {0} h","other":"dentro de {0} h"},"past":{"one":"há {0} h","other":"há {0} h"}}},"minute":{"displayName":"minuto","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"dentro de {0} minuto","other":"dentro de {0} minutos"},"past":{"one":"há {0} minuto","other":"há {0} minutos"}}},"minute-short":{"displayName":"min","relative":{"0":"este minuto"},"relativeTime":{"future":{"one":"dentro de {0} min","other":"dentro de {0} min"},"past":{"one":"há {0} min","other":"há {0} min"}}},"second":{"displayName":"segundo","relative":{"0":"agora"},"relativeTime":{"future":{"one":"dentro de {0} segundo","other":"dentro de {0} segundos"},"past":{"one":"há {0} segundo","other":"há {0} segundos"}}},"second-short":{"displayName":"s","relative":{"0":"agora"},"relativeTime":{"future":{"one":"dentro de {0} s","other":"dentro de {0} s"},"past":{"one":"há {0} s","other":"há {0} s"}}}}});
+addLocaleData({ locale: "pt-AO", parentLocale: "pt-PT" });
+addLocaleData({ locale: "pt-BR", parentLocale: "pt" });
+addLocaleData({ locale: "pt-MZ", parentLocale: "pt-PT" });
+addLocaleData({ locale: "ru", pluralRuleFunction: function (n,ord){var s=String(n).split("."),i=s[0],v0=!s[1],i10=i.slice(-1),i100=i.slice(-2);if(ord)return"other";return v0&&i10==1&&i100!=11?"one":v0&&i10>=2&&i10<=4&&(i100<12||i100>14)?"few":(v0&&i10==0)||(v0&&i10>=5&&i10<=9)||(v0&&i100>=11&&i100<=14)?"many":"other";},"fields":{"year":{"displayName":"год","relative":{"0":"в этом году","1":"в следующем году","-1":"в прошлом году"},"relativeTime":{"future":{"one":"через {0} год","few":"через {0} года","many":"через {0} лет","other":"через {0} года"},"past":{"one":"{0} год назад","few":"{0} года назад","many":"{0} лет назад","other":"{0} года назад"}}},"year-short":{"displayName":"г.","relative":{"0":"в этом г.","1":"в след. г.","-1":"в прошлом г."},"relativeTime":{"future":{"one":"через {0} г.","few":"через {0} г.","many":"через {0} л.","other":"через {0} г."},"past":{"one":"{0} г. назад","few":"{0} г. назад","many":"{0} л. назад","other":"{0} г. назад"}}},"month":{"displayName":"месяц","relative":{"0":"в этом месяце","1":"в следующем месяце","-1":"в прошлом месяце"},"relativeTime":{"future":{"one":"через {0} месяц","few":"через {0} месяца","many":"через {0} месяцев","other":"через {0} месяца"},"past":{"one":"{0} месяц назад","few":"{0} месяца назад","many":"{0} месяцев назад","other":"{0} месяца назад"}}},"month-short":{"displayName":"мес.","relative":{"0":"в этом мес.","1":"в следующем мес.","-1":"в прошлом мес."},"relativeTime":{"future":{"one":"через {0} мес.","few":"через {0} мес.","many":"через {0} мес.","other":"через {0} мес."},"past":{"one":"{0} мес. назад","few":"{0} мес. назад","many":"{0} мес. назад","other":"{0} мес. назад"}}},"week":{"displayName":"неделя","relativePeriod":"на неделе {0}","relative":{"0":"на этой неделе","1":"на следующей неделе","-1":"на прошлой неделе"},"relativeTime":{"future":{"one":"через {0} неделю","few":"через {0} недели","many":"через {0} недель","other":"через {0} недели"},"past":{"one":"{0} неделю назад","few":"{0} недели назад","many":"{0} недель назад","other":"{0} недели назад"}}},"week-short":{"displayName":"нед.","relativePeriod":"на нед. {0}","relative":{"0":"на этой нед.","1":"на следующей нед.","-1":"на прошлой нед."},"relativeTime":{"future":{"one":"через {0} нед.","few":"через {0} нед.","many":"через {0} нед.","other":"через {0} нед."},"past":{"one":"{0} нед. назад","few":"{0} нед. назад","many":"{0} нед. назад","other":"{0} нед. назад"}}},"day":{"displayName":"день","relative":{"0":"сегодня","1":"завтра","2":"послезавтра","-1":"вчера","-2":"позавчера"},"relativeTime":{"future":{"one":"через {0} день","few":"через {0} дня","many":"через {0} дней","other":"через {0} дня"},"past":{"one":"{0} день назад","few":"{0} дня назад","many":"{0} дней назад","other":"{0} дня назад"}}},"day-short":{"displayName":"дн.","relative":{"0":"сегодня","1":"завтра","2":"послезавтра","-1":"вчера","-2":"позавчера"},"relativeTime":{"future":{"one":"через {0} дн.","few":"через {0} дн.","many":"через {0} дн.","other":"через {0} дн."},"past":{"one":"{0} дн. назад","few":"{0} дн. назад","many":"{0} дн. назад","other":"{0} дн. назад"}}},"hour":{"displayName":"час","relative":{"0":"в этот час"},"relativeTime":{"future":{"one":"через {0} час","few":"через {0} часа","many":"через {0} часов","other":"через {0} часа"},"past":{"one":"{0} час назад","few":"{0} часа назад","many":"{0} часов назад","other":"{0} часа назад"}}},"hour-short":{"displayName":"ч","relative":{"0":"в этот час"},"relativeTime":{"future":{"one":"через {0} ч.","few":"через {0} ч.","many":"через {0} ч.","other":"через {0} ч."},"past":{"one":"{0} ч. назад","few":"{0} ч. назад","many":"{0} ч. назад","other":"{0} ч. назад"}}},"minute":{"displayName":"минута","relative":{"0":"в эту минуту"},"relativeTime":{"future":{"one":"через {0} минуту","few":"через {0} минуты","many":"через {0} минут","other":"через {0} минуты"},"past":{"one":"{0} минуту назад","few":"{0} минуты назад","many":"{0} минут назад","other":"{0} минуты назад"}}},"minute-short":{"displayName":"мин.","relative":{"0":"в эту минуту"},"relativeTime":{"future":{"one":"через {0} мин.","few":"через {0} мин.","many":"через {0} мин.","other":"через {0} мин."},"past":{"one":"{0} мин. назад","few":"{0} мин. назад","many":"{0} мин. назад","other":"{0} мин. назад"}}},"second":{"displayName":"секунда","relative":{"0":"сейчас"},"relativeTime":{"future":{"one":"через {0} секунду","few":"через {0} секунды","many":"через {0} секунд","other":"через {0} секунды"},"past":{"one":"{0} секунду назад","few":"{0} секунды назад","many":"{0} секунд назад","other":"{0} секунды назад"}}},"second-short":{"displayName":"сек.","relative":{"0":"сейчас"},"relativeTime":{"future":{"one":"через {0} сек.","few":"через {0} сек.","many":"через {0} сек.","other":"через {0} сек."},"past":{"one":"{0} сек. назад","few":"{0} сек. назад","many":"{0} сек. назад","other":"{0} сек. назад"}}}} });
 addLocaleData({ locale: "ru-RU", parentLocale: "ru" });
+addLocaleData({ locale: "tr", pluralRuleFunction: function (n, ord) {if (ord) return 'other';return (n == 1) ? 'one' : 'other';},"fields":{"year":{"displayName":"yıl","relative":{"0":"bu yıl","1":"gelecek yıl","-1":"geçen yıl"},"relativeTime":{"future":{"one":"{0} yıl sonra","other":"{0} yıl sonra"},"past":{"one":"{0} yıl önce","other":"{0} yıl önce"}}},"year-short":{"displayName":"yıl","relative":{"0":"bu yıl","1":"gelecek yıl","-1":"geçen yıl"},"relativeTime":{"future":{"one":"{0} yıl sonra","other":"{0} yıl sonra"},"past":{"one":"{0} yıl önce","other":"{0} yıl önce"}}},"month":{"displayName":"ay","relative":{"0":"bu ay","1":"gelecek ay","-1":"geçen ay"},"relativeTime":{"future":{"one":"{0} ay sonra","other":"{0} ay sonra"},"past":{"one":"{0} ay önce","other":"{0} ay önce"}}},"month-short":{"displayName":"ay","relative":{"0":"bu ay","1":"gelecek ay","-1":"geçen ay"},"relativeTime":{"future":{"one":"{0} ay sonra","other":"{0} ay sonra"},"past":{"one":"{0} ay önce","other":"{0} ay önce"}}},"week":{"displayName":"hafta","relativePeriod":"{0} haftası","relative":{"0":"bu hafta","1":"gelecek hafta","-1":"geçen hafta"},"relativeTime":{"future":{"one":"{0} hafta sonra","other":"{0} hafta sonra"},"past":{"one":"{0} hafta önce","other":"{0} hafta önce"}}},"week-short":{"displayName":"hf.","relativePeriod":"{0} haftası","relative":{"0":"bu hafta","1":"gelecek hafta","-1":"geçen hafta"},"relativeTime":{"future":{"one":"{0} hf. sonra","other":"{0} hf. sonra"},"past":{"one":"{0} hf. önce","other":"{0} hf. önce"}}},"day":{"displayName":"gün","relative":{"0":"bugün","1":"yarın","2":"öbür gün","-2":"evvelsi gün","-1":"dün"},"relativeTime":{"future":{"one":"{0} gün sonra","other":"{0} gün sonra"},"past":{"one":"{0} gün önce","other":"{0} gün önce"}}},"day-short":{"displayName":"gün","relative":{"0":"bugün","1":"yarın","2":"öbür gün","-2":"evvelsi gün","-1":"dün"},"relativeTime":{"future":{"one":"{0} gün sonra","other":"{0} gün sonra"},"past":{"one":"{0} gün önce","other":"{0} gün önce"}}},"hour":{"displayName":"saat","relative":{"0":"bu saat"},"relativeTime":{"future":{"one":"{0} saat sonra","other":"{0} saat sonra"},"past":{"one":"{0} saat önce","other":"{0} saat önce"}}},"hour-short":{"displayName":"sa.","relative":{"0":"bu saat"},"relativeTime":{"future":{"one":"{0} sa. sonra","other":"{0} sa. sonra"},"past":{"one":"{0} sa. önce","other":"{0} sa. önce"}}},"minute":{"displayName":"dakika","relative":{"0":"bu dakika"},"relativeTime":{"future":{"one":"{0} dakika sonra","other":"{0} dakika sonra"},"past":{"one":"{0} dakika önce","other":"{0} dakika önce"}}},"minute-short":{"displayName":"dk.","relative":{"0":"bu dakika"},"relativeTime":{"future":{"one":"{0} dk. sonra","other":"{0} dk. sonra"},"past":{"one":"{0} dk. önce","other":"{0} dk. önce"}}},"second":{"displayName":"saniye","relative":{"0":"şimdi"},"relativeTime":{"future":{"one":"{0} saniye sonra","other":"{0} saniye sonra"},"past":{"one":"{0} saniye önce","other":"{0} saniye önce"}}},"second-short":{"displayName":"sn.","relative":{"0":"şimdi"},"relativeTime":{"future":{"one":"{0} sn. sonra","other":"{0} sn. sonra"},"past":{"one":"{0} sn. önce","other":"{0} sn. önce"}}}}});
+addLocaleData({ locale: "tr-CY", parentLocale: "tr" });
+addLocaleData({ locale: "tr-TR", parentLocale: "tr" });
 addLocaleData({ locale: "zh", pluralRuleFunction: function (n,ord){if(ord)return"other";return"other"},"fields":{"year":{"displayName":"年","relative":{"0":"今年","1":"明年","-1":"去年"},"relativeTime":{"future":{"other":"{0}年后"},"past":{"other":"{0}年前"}}},"year-short":{"displayName":"年","relative":{"0":"今年","1":"明年","-1":"去年"},"relativeTime":{"future":{"other":"{0}年后"},"past":{"other":"{0}年前"}}},"month":{"displayName":"月","relative":{"0":"本月","1":"下个月","-1":"上个月"},"relativeTime":{"future":{"other":"{0}个月后"},"past":{"other":"{0}个月前"}}},"month-short":{"displayName":"月","relative":{"0":"本月","1":"下个月","-1":"上个月"},"relativeTime":{"future":{"other":"{0}个月后"},"past":{"other":"{0}个月前"}}},"day":{"displayName":"日","relative":{"0":"今天","1":"明天","2":"后天","-2":"前天","-1":"昨天"},"relativeTime":{"future":{"other":"{0}天后"},"past":{"other":"{0}天前"}}},"day-short":{"displayName":"日","relative":{"0":"今天","1":"明天","2":"后天","-2":"前天","-1":"昨天"},"relativeTime":{"future":{"other":"{0}天后"},"past":{"other":"{0}天前"}}},"hour":{"displayName":"小时","relative":{"0":"这一时间 \u002F 此时"},"relativeTime":{"future":{"other":"{0}小时后"},"past":{"other":"{0}小时前"}}},"hour-short":{"displayName":"小时","relative":{"0":"这一时间 \u002F 此时"},"relativeTime":{"future":{"other":"{0}小时后"},"past":{"other":"{0}小时前"}}},"minute":{"displayName":"分钟","relative":{"0":"此刻"},"relativeTime":{"future":{"other":"{0}分钟后"},"past":{"other":"{0}分钟前"}}},"minute-short":{"displayName":"分","relative":{"0":"此刻"},"relativeTime":{"future":{"other":"{0}分钟后"},"past":{"other":"{0}分钟前"}}},"second":{"displayName":"秒","relative":{"0":"现在"},"relativeTime":{"future":{"other":"{0}秒钟后"},"past":{"other":"{0}秒钟前"}}},"second-short":{"displayName":"秒","relative":{"0":"现在"},"relativeTime":{"future":{"other":"{0}秒后"},"past":{"other":"{0}秒前"}}}} });
+addLocaleData({ locale: "zh-Hans", parentLocale: "zh" });
 addLocaleData({ locale: "zh-CN", parentLocale: "zh" });
+addLocaleData({ locale: "zh-Hans-SG", parentLocale: "zh-Hans", "fields":{"year":{"displayName":"年","relative":{"0":"今年","1":"明年","-1":"去年"},"relativeTime":{"future":{"other":"{0}年后"},"past":{"other":"{0}年前"}}},"year-short":{"displayName":"年","relative":{"0":"今年","1":"明年","-1":"去年"},"relativeTime":{"future":{"other":"{0}年后"},"past":{"other":"{0}年前"}}},"month":{"displayName":"月","relative":{"0":"本月","1":"下个月","-1":"上个月"},"relativeTime":{"future":{"other":"{0}个月后"},"past":{"other":"{0}个月前"}}},"month-short":{"displayName":"月","relative":{"0":"本月","1":"下个月","-1":"上个月"},"relativeTime":{"future":{"other":"{0}个月后"},"past":{"other":"{0}个月前"}}},"week":{"displayName":"周","relativePeriod":"{0}这周","relative":{"0":"本周","1":"下周","-1":"上周"},"relativeTime":{"future":{"other":"{0}周后"},"past":{"other":"{0}周前"}}},"week-short":{"displayName":"周","relativePeriod":"{0}这周","relative":{"0":"本周","1":"下周","-1":"上周"},"relativeTime":{"future":{"other":"{0}周后"},"past":{"other":"{0}周前"}}},"day":{"displayName":"日","relative":{"0":"今天","1":"明天","2":"后天","-2":"前天","-1":"昨天"},"relativeTime":{"future":{"other":"{0}天后"},"past":{"other":"{0}天前"}}},"day-short":{"displayName":"日","relative":{"0":"今天","1":"明天","2":"后天","-2":"前天","-1":"昨天"},"relativeTime":{"future":{"other":"{0}天后"},"past":{"other":"{0}天前"}}},"hour":{"displayName":"小时","relative":{"0":"这一时间 \u002F 此时"},"relativeTime":{"future":{"other":"{0}小时后"},"past":{"other":"{0}小时前"}}},"hour-short":{"displayName":"小时","relative":{"0":"这一时间 \u002F 此时"},"relativeTime":{"future":{"other":"{0}小时后"},"past":{"other":"{0}小时前"}}},"minute":{"displayName":"分钟","relative":{"0":"此刻"},"relativeTime":{"future":{"other":"{0}分钟后"},"past":{"other":"{0}分钟前"}}},"minute-short":{"displayName":"分","relative":{"0":"此刻"},"relativeTime":{"future":{"other":"{0}分钟后"},"past":{"other":"{0}分钟前"}}},"second":{"displayName":"秒","relative":{"0":"现在"},"relativeTime":{"future":{"other":"{0}秒后"},"past":{"other":"{0}秒前"}}},"second-short":{"displayName":"秒","relative":{"0":"现在"},"relativeTime":{"future":{"other":"{0}秒后"},"past":{"other":"{0}秒前"}}}}});
+addLocaleData({ locale: "zh-Hant", pluralRuleFunction: function (n) {return 'other';},"fields":{"year":{"displayName":"年","relative":{"0":"今年","1":"明年","-1":"去年"},"relativeTime":{"future":{"other":"{0} 年後"},"past":{"other":"{0} 年前"}}},"year-short":{"displayName":"年","relative":{"0":"今年","1":"明年","-1":"去年"},"relativeTime":{"future":{"other":"{0} 年後"},"past":{"other":"{0} 年前"}}},"month":{"displayName":"月","relative":{"0":"本月","1":"下個月","-1":"上個月"},"relativeTime":{"future":{"other":"{0} 個月後"},"past":{"other":"{0} 個月前"}}},"month-short":{"displayName":"月","relative":{"0":"本月","1":"下個月","-1":"上個月"},"relativeTime":{"future":{"other":"{0} 個月後"},"past":{"other":"{0} 個月前"}}},"week":{"displayName":"週","relativePeriod":"{0} 當週","relative":{"0":"本週","1":"下週","-1":"上週"},"relativeTime":{"future":{"other":"{0} 週後"},"past":{"other":"{0} 週前"}}},"week-short":{"displayName":"週","relativePeriod":"{0} 當週","relative":{"0":"本週","1":"下週","-1":"上週"},"relativeTime":{"future":{"other":"{0} 週後"},"past":{"other":"{0} 週前"}}},"day":{"displayName":"日","relative":{"0":"今天","1":"明天","2":"後天","-2":"前天","-1":"昨天"},"relativeTime":{"future":{"other":"{0} 天後"},"past":{"other":"{0} 天前"}}},"day-short":{"displayName":"日","relative":{"0":"今天","1":"明天","2":"後天","-2":"前天","-1":"昨天"},"relativeTime":{"future":{"other":"{0} 天後"},"past":{"other":"{0} 天前"}}},"hour":{"displayName":"小時","relative":{"0":"這一小時"},"relativeTime":{"future":{"other":"{0} 小時後"},"past":{"other":"{0} 小時前"}}},"hour-short":{"displayName":"小時","relative":{"0":"這一小時"},"relativeTime":{"future":{"other":"{0} 小時後"},"past":{"other":"{0} 小時前"}}},"minute":{"displayName":"分鐘","relative":{"0":"這一分鐘"},"relativeTime":{"future":{"other":"{0} 分鐘後"},"past":{"other":"{0} 分鐘前"}}},"minute-short":{"displayName":"分鐘","relative":{"0":"這一分鐘"},"relativeTime":{"future":{"other":"{0} 分鐘後"},"past":{"other":"{0} 分鐘前"}}},"second":{"displayName":"秒","relative":{"0":"現在"},"relativeTime":{"future":{"other":"{0} 秒後"},"past":{"other":"{0} 秒前"}}},"second-short":{"displayName":"秒","relative":{"0":"現在"},"relativeTime":{"future":{"other":"{0} 秒後"},"past":{"other":"{0} 秒前"}}}}});
+addLocaleData({ locale: "zh-Hant-HK", parentLocale: "zh-Hant", "fields":{"year":{"displayName":"年","relative":{"0":"今年","1":"下年","-1":"上年"},"relativeTime":{"future":{"other":"{0} 年後"},"past":{"other":"{0} 年前"}}},"year-short":{"displayName":"年","relative":{"0":"今年","1":"下年","-1":"上年"},"relativeTime":{"future":{"other":"{0} 年後"},"past":{"other":"{0} 年前"}}},"month":{"displayName":"月","relative":{"0":"本月","1":"下個月","-1":"上個月"},"relativeTime":{"future":{"other":"{0} 個月後"},"past":{"other":"{0} 個月前"}}},"month-short":{"displayName":"月","relative":{"0":"本月","1":"下個月","-1":"上個月"},"relativeTime":{"future":{"other":"{0} 個月後"},"past":{"other":"{0} 個月前"}}},"week":{"displayName":"星期","relativePeriod":"{0} 當週","relative":{"0":"本星期","1":"下星期","-1":"上星期"},"relativeTime":{"future":{"other":"{0} 星期後"},"past":{"other":"{0} 星期前"}}},"week-short":{"displayName":"星期","relativePeriod":"{0} 當週","relative":{"0":"本星期","1":"下星期","-1":"上星期"},"relativeTime":{"future":{"other":"{0} 星期後"},"past":{"other":"{0} 星期前"}}},"day":{"displayName":"日","relative":{"0":"今日","1":"明日","2":"後日","-2":"前日","-1":"昨日"},"relativeTime":{"future":{"other":"{0} 日後"},"past":{"other":"{0} 日前"}}},"day-short":{"displayName":"日","relative":{"0":"今日","1":"明日","2":"後日","-2":"前日","-1":"昨日"},"relativeTime":{"future":{"other":"{0} 日後"},"past":{"other":"{0} 日前"}}},"hour":{"displayName":"小時","relative":{"0":"這個小時"},"relativeTime":{"future":{"other":"{0} 小時後"},"past":{"other":"{0} 小時前"}}},"hour-short":{"displayName":"小時","relative":{"0":"這個小時"},"relativeTime":{"future":{"other":"{0} 小時後"},"past":{"other":"{0} 小時前"}}},"minute":{"displayName":"分鐘","relative":{"0":"這分鐘"},"relativeTime":{"future":{"other":"{0} 分鐘後"},"past":{"other":"{0} 分鐘前"}}},"minute-short":{"displayName":"分鐘","relative":{"0":"這分鐘"},"relativeTime":{"future":{"other":"{0} 分鐘後"},"past":{"other":"{0} 分鐘前"}}},"second":{"displayName":"秒","relative":{"0":"現在"},"relativeTime":{"future":{"other":"{0} 秒後"},"past":{"other":"{0} 秒前"}}},"second-short":{"displayName":"秒","relative":{"0":"現在"},"relativeTime":{"future":{"other":"{0} 秒後"},"past":{"other":"{0} 秒前"}}}}});
+addLocaleData({ locale: "zh-HK", parentLocale: "zh-Hant-HK" });
+addLocaleData({ locale: "zh-Hant-MO", parentLocale: "zh-Hant-HK" });
+addLocaleData({ locale: "zh-MO", parentLocale: "zh-Hant-HK" });
+addLocaleData({ locale: "zh-SG", parentLocale: "zh-Hans-SG" });
+addLocaleData({ locale: "zh-TW", parentLocale: "zh-Hant" });
diff --git a/packages/osd-i18n/src/loader.ts b/packages/osd-i18n/src/loader.ts
index c5fec0168e9f..6454a8a2f980 100644
--- a/packages/osd-i18n/src/loader.ts
+++ b/packages/osd-i18n/src/loader.ts
@@ -34,6 +34,7 @@ import { promisify } from 'util';
 
 import { unique } from './core/helper';
 import { Translation } from './translation';
+import { normalizeLocale } from './core';
 
 const TRANSLATION_FILE_EXTENSION = '.json';
 
@@ -69,7 +70,9 @@ function getLocaleFromFileName(fullFileName: string) {
     );
   }
 
-  return path.basename(fullFileName, TRANSLATION_FILE_EXTENSION);
+  const basename = path.basename(fullFileName, TRANSLATION_FILE_EXTENSION);
+
+  return normalizeLocale(basename);
 }
 
 /**
@@ -131,6 +134,15 @@ export function getRegisteredLocales() {
   return Object.keys(translationsRegistry);
 }
 
+/**
+ * Check if a locale is registered; returns undefined if i18n is uninitialized
+ */
+export function isRegisteredLocale(locale: string): boolean | undefined {
+  const normalizedLocale = normalizeLocale(locale);
+
+  return translationsRegistry?.hasOwnProperty(normalizedLocale);
+}
+
 /**
  * Returns translation messages by specified locale
  * @param locale
diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json
index 0a6c75867440..4f66f7c5a08d 100644
--- a/packages/osd-ui-framework/package.json
+++ b/packages/osd-ui-framework/package.json
@@ -23,7 +23,7 @@
     "enzyme-adapter-react-16": "^1.9.1"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.16.0",
     "@osd/babel-preset": "1.0.0",
     "@osd/optimizer": "1.0.0",
     "comment-stripper": "^0.0.4",
diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json
index 9e2a5646a872..038dc61de7a7 100644
--- a/packages/osd-ui-shared-deps/package.json
+++ b/packages/osd-ui-shared-deps/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "31.1.0",
-    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.16.0",
     "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0",
     "@opensearch/datemath": "5.0.3",
     "@osd/i18n": "1.0.0",
diff --git a/src/core/public/application/scoped_history.test.ts b/src/core/public/application/scoped_history.test.ts
index 6575a6aa1ab1..067c33256bd1 100644
--- a/src/core/public/application/scoped_history.test.ts
+++ b/src/core/public/application/scoped_history.test.ts
@@ -30,23 +30,8 @@
 
 import { ScopedHistory } from './scoped_history';
 import { createMemoryHistory } from 'history';
-import { getLocaleInUrl } from '../locale_helper';
-import { i18n } from '@osd/i18n';
-
-jest.mock('../locale_helper', () => ({
-  getLocaleInUrl: jest.fn(),
-}));
-
-jest.mock('@osd/i18n', () => ({
-  i18n: {
-    getLocale: jest.fn(),
-  },
-}));
 
 describe('ScopedHistory', () => {
-  beforeEach(() => {
-    (getLocaleInUrl as jest.Mock).mockReturnValue('en');
-  });
   describe('construction', () => {
     it('succeeds if current location matches basePath', () => {
       const gh = createMemoryHistory();
@@ -373,49 +358,4 @@ describe('ScopedHistory', () => {
       expect(gh.length).toBe(4);
     });
   });
-
-  describe('locale handling', () => {
-    let originalLocation: Location;
-
-    beforeEach(() => {
-      originalLocation = window.location;
-      delete (window as any).location;
-      window.location = { href: 'http://localhost/app/wow', reload: jest.fn() } as any;
-      (i18n.getLocale as jest.Mock).mockReturnValue('en');
-    });
-
-    afterEach(() => {
-      window.location = originalLocation;
-      jest.resetAllMocks();
-    });
-
-    it('reloads the page when locale changes', () => {
-      const gh = createMemoryHistory();
-      gh.push('/app/wow');
-      const h = new ScopedHistory(gh, '/app/wow');
-      // Use the 'h' variable to trigger the listener
-      h.push('/new-page');
-
-      // Mock getLocaleInUrl to return a different locale
-      (getLocaleInUrl as jest.Mock).mockReturnValue('fr');
-
-      // Simulate navigation
-      gh.push('/app/wow/new-page');
-
-      expect(window.location.reload).toHaveBeenCalled();
-    });
-
-    it('does not reload the page when locale changes', () => {
-      const gh = createMemoryHistory();
-      gh.push('/app/wow');
-
-      // Mock getLocaleInUrl to return a different locale
-      (getLocaleInUrl as jest.Mock).mockReturnValue('en');
-
-      // Simulate navigation
-      gh.push('/app/wow/new-page');
-
-      expect(window.location.reload).not.toHaveBeenCalled();
-    });
-  });
 });
diff --git a/src/core/public/application/scoped_history.ts b/src/core/public/application/scoped_history.ts
index 74e4bb068d3e..487093be191f 100644
--- a/src/core/public/application/scoped_history.ts
+++ b/src/core/public/application/scoped_history.ts
@@ -39,8 +39,6 @@ import {
   Href,
   Action,
 } from 'history';
-import { i18n } from '@osd/i18n';
-import { getLocaleInUrl } from '../locale_helper';
 
 /**
  * A wrapper around a `History` instance that is scoped to a particular base path of the history stack. Behaves
@@ -309,7 +307,6 @@ export class ScopedHistory<HistoryLocationState = unknown>
    * state. Also forwards events to child listeners with the base path stripped from the location.
    */
   private setupHistoryListener() {
-    const currentLocale = i18n.getLocale() || 'en';
     const unlisten = this.parentHistory.listen((location, action) => {
       // If the user navigates outside the scope of this basePath, tear it down.
       if (!location.pathname.startsWith(this.basePath)) {
@@ -318,14 +315,6 @@ export class ScopedHistory<HistoryLocationState = unknown>
         return;
       }
 
-      const localeValue = getLocaleInUrl(window.location.href);
-
-      if (localeValue !== currentLocale) {
-        // Force a full page reload
-        window.location.reload();
-        return;
-      }
-
       /**
        * Track location keys using the same algorithm the browser uses internally.
        * - On PUSH, remove all items that came after the current location and append the new location.
diff --git a/src/core/public/chrome/chrome_service.mock.ts b/src/core/public/chrome/chrome_service.mock.ts
index c63232186672..19997a87561a 100644
--- a/src/core/public/chrome/chrome_service.mock.ts
+++ b/src/core/public/chrome/chrome_service.mock.ts
@@ -41,6 +41,9 @@ const createSetupContractMock = () => {
       getNavGroupEnabled: jest.fn(),
       registerNavGroupUpdater: jest.fn(),
     },
+    globalSearch: {
+      registerSearchCommand: jest.fn(),
+    },
   };
 };
 
@@ -83,6 +86,9 @@ const createStartContractMock = () => {
       getCurrentNavGroup$: jest.fn(() => new BehaviorSubject(undefined)),
       setCurrentNavGroup: jest.fn(),
     },
+    globalSearch: {
+      getAllSearchCommands: jest.fn(() => []),
+    },
     setAppTitle: jest.fn(),
     setIsVisible: jest.fn(),
     getIsVisible$: jest.fn(),
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 69665006d5b3..9461f89ec773 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -67,6 +67,11 @@ import {
   ChromeNavGroupServiceSetupContract,
   ChromeNavGroupServiceStartContract,
 } from './nav_group';
+import {
+  GlobalSearchService,
+  GlobalSearchServiceSetupContract,
+  GlobalSearchServiceStartContract,
+} from './global_search';
 
 export { ChromeNavControls, ChromeRecentlyAccessed, ChromeDocTitle };
 
@@ -137,6 +142,7 @@ export class ChromeService {
   private readonly recentlyAccessed = new RecentlyAccessedService();
   private readonly docTitle = new DocTitleService();
   private readonly navGroup = new ChromeNavGroupService();
+  private readonly globalSearch = new GlobalSearchService();
   private useUpdatedHeader = false;
   private updatedHeaderSubscription: Subscription | undefined;
   private collapsibleNavHeaderRender?: CollapsibleNavHeaderRender;
@@ -199,6 +205,7 @@ export class ChromeService {
 
   public setup({ uiSettings }: SetupDeps): ChromeSetup {
     const navGroup = this.navGroup.setup({ uiSettings });
+    const globalSearch = this.globalSearch.setup();
     return {
       registerCollapsibleNavHeader: (render: CollapsibleNavHeaderRender) => {
         if (this.collapsibleNavHeaderRender) {
@@ -210,6 +217,7 @@ export class ChromeService {
         this.collapsibleNavHeaderRender = render;
       },
       navGroup,
+      globalSearch,
     };
   }
 
@@ -256,6 +264,8 @@ export class ChromeService {
       workspaces,
     });
 
+    const globalSearch = this.globalSearch.start();
+
     // erase chrome fields from a previous app while switching to a next app
     application.currentAppId$.subscribe(() => {
       helpExtension$.next(undefined);
@@ -347,6 +357,7 @@ export class ChromeService {
       docTitle,
       logos,
       navGroup,
+      globalSearch,
 
       getHeaderComponent: () => (
         <Header
@@ -389,6 +400,7 @@ export class ChromeService {
           workspaceList$={workspaces.workspaceList$}
           currentWorkspace$={workspaces.currentWorkspace$}
           useUpdatedHeader={this.useUpdatedHeader}
+          globalSearchCommands={globalSearch.getAllSearchCommands()}
         />
       ),
 
@@ -477,6 +489,8 @@ export class ChromeService {
 export interface ChromeSetup {
   registerCollapsibleNavHeader: (render: CollapsibleNavHeaderRender) => void;
   navGroup: ChromeNavGroupServiceSetupContract;
+  /** {@inheritdoc GlobalSearchService} */
+  globalSearch: GlobalSearchServiceSetupContract;
 }
 
 /**
@@ -518,6 +532,8 @@ export interface ChromeStart {
   navGroup: ChromeNavGroupServiceStartContract;
   /** {@inheritdoc Logos} */
   readonly logos: Logos;
+  /** {@inheritdoc GlobalSearchService} */
+  globalSearch: GlobalSearchServiceStartContract;
 
   /**
    * Sets the current app's title
@@ -606,7 +622,7 @@ export interface ChromeStart {
   setCustomNavLink(newCustomNavLink?: Partial<ChromeNavLink>): void;
 
   /**
-   * Get an observable of the current custom help conttent
+   * Get an observable of the current custom help content
    */
   getHelpExtension$(): Observable<ChromeHelpExtension | undefined>;
 
diff --git a/src/core/public/chrome/global_search/global_search_service.test.ts b/src/core/public/chrome/global_search/global_search_service.test.ts
new file mode 100644
index 000000000000..838423c7a1d6
--- /dev/null
+++ b/src/core/public/chrome/global_search/global_search_service.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// test global_search_service.ts
+import { GlobalSearchService } from './global_search_service';
+
+describe('GlobalSearchService', () => {
+  it('registerSearchCommand', async () => {
+    const globalSearchService = new GlobalSearchService();
+    const setup = globalSearchService.setup();
+    const start = globalSearchService.start();
+
+    setup.registerSearchCommand({
+      id: 'test1',
+      type: 'PAGES',
+      run: async (query) => {
+        return [];
+      },
+    });
+
+    expect(start.getAllSearchCommands()).toHaveLength(1);
+    expect(start.getAllSearchCommands()[0].id).toEqual('test1');
+    expect(start.getAllSearchCommands()[0].type).toEqual('PAGES');
+  });
+
+  it('registerSearchCommand with duplicate id', async () => {
+    const globalSearchService = new GlobalSearchService();
+    const setup = globalSearchService.setup();
+    const start = globalSearchService.start();
+
+    setup.registerSearchCommand({
+      id: 'test2',
+      type: 'PAGES',
+      run: async (query) => {
+        return [];
+      },
+    });
+
+    setup.registerSearchCommand({
+      id: 'test2',
+      type: 'SAVED_OBJECTS',
+      run: async (query) => {
+        return [];
+      },
+    });
+
+    // the second one will not overwrite the first one
+    expect(start.getAllSearchCommands()).toHaveLength(1);
+    expect(start.getAllSearchCommands()[0].id).toEqual('test2');
+    expect(start.getAllSearchCommands()[0].type).toEqual('PAGES');
+  });
+});
diff --git a/src/core/public/chrome/global_search/global_search_service.ts b/src/core/public/chrome/global_search/global_search_service.ts
new file mode 100644
index 000000000000..31fc65e82dfa
--- /dev/null
+++ b/src/core/public/chrome/global_search/global_search_service.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ReactNode } from 'react';
+import { i18n } from '@osd/i18n';
+
+/**
+ * search input match with `@` will handled by saved objects search command
+ * search input match with `>` will handled by plugin customized commands
+ */
+export const SAVED_OBJECTS_SYMBOL = '@';
+export const COMMANDS_SYMBOL = '>';
+
+export const SearchCommandTypes = {
+  PAGES: {
+    description: i18n.translate('core.globalSearch.pages.description', { defaultMessage: 'Pages' }),
+    alias: null,
+  },
+  SAVED_OBJECTS: {
+    description: i18n.translate('core.globalSearch.assets.description', {
+      defaultMessage: 'Assets',
+    }),
+    alias: SAVED_OBJECTS_SYMBOL,
+  },
+} as const;
+
+export type SearchCommandKeyTypes = keyof typeof SearchCommandTypes;
+
+/**
+ * @experimental
+ */
+export interface GlobalSearchCommand {
+  /**
+   * unique id of this command
+   */
+  id: string;
+  /**
+   * search command type
+   * @type {SearchCommandTypes}
+   */
+  type: SearchCommandKeyTypes;
+  /**
+   * do the search and return search result with a React element
+   * @param value search query
+   * @param callback callback function when search is done
+   */
+  run(value: string, callback?: () => void): Promise<ReactNode[]>;
+}
+
+export interface GlobalSearchServiceSetupContract {
+  registerSearchCommand(searchCommand: GlobalSearchCommand): void;
+}
+
+export interface GlobalSearchServiceStartContract {
+  getAllSearchCommands(): GlobalSearchCommand[];
+}
+
+/**
+ * {@link GlobalSearchCommand | APIs} for registering new global search command when do search from header search bar .
+ *
+ * @example
+ * Register a GlobalSearchCommand to search pages
+ * ```jsx
+ * chrome.globalSearch.registerSearchCommand({
+ *   id: 'test',
+ *   type: SearchObjectTypes.PAGES,
+ *   run: async (query) => {
+ *     return [];
+ *   },
+ * })
+ * ```
+ *
+ * @experimental
+ */
+export class GlobalSearchService {
+  private searchCommands = [] as GlobalSearchCommand[];
+
+  private registerSearchCommand(searchHandler: GlobalSearchCommand) {
+    const exists = this.searchCommands.find((item) => {
+      return item.id === searchHandler.id;
+    });
+    if (exists) {
+      // eslint-disable-next-line no-console
+      console.warn(`Duplicate SearchCommands id ${searchHandler.id} found`);
+      return;
+    }
+    this.searchCommands.push(searchHandler);
+  }
+
+  public setup(): GlobalSearchServiceSetupContract {
+    return {
+      registerSearchCommand: this.registerSearchCommand.bind(this),
+    };
+  }
+
+  public start(): GlobalSearchServiceStartContract {
+    return {
+      getAllSearchCommands: () => this.searchCommands,
+    };
+  }
+}
diff --git a/src/core/public/chrome/global_search/index.ts b/src/core/public/chrome/global_search/index.ts
new file mode 100644
index 000000000000..ae34ceb1b725
--- /dev/null
+++ b/src/core/public/chrome/global_search/index.ts
@@ -0,0 +1,6 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './global_search_service';
diff --git a/src/core/public/chrome/index.ts b/src/core/public/chrome/index.ts
index 5403634705c4..9fbc84b2e0d8 100644
--- a/src/core/public/chrome/index.ts
+++ b/src/core/public/chrome/index.ts
@@ -61,3 +61,4 @@ export { ChromeDocTitle } from './doc_title';
 export { RightNavigationOrder, HeaderVariant } from './constants';
 export { ChromeRegistrationNavLink, ChromeNavGroupUpdater, NavGroupItemInMap } from './nav_group';
 export { fulfillRegistrationLinksToChromeNavLinks, LinkItemType, getSortedNavLinks } from './utils';
+export { SearchCommandKeyTypes, GlobalSearchCommand } from './global_search';
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
index c3159005c50b..b65c2335a046 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
@@ -20,6 +20,9 @@ exports[`<CollapsibleNavGroupEnabled /> should render correctly 1`] = `
           go back
         </button>
       </div>
+      <div
+        class="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder searchBar-wrapper"
+      />
       <div
         class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder eui-yScroll flex-1-container"
         style="padding-top: 0px;"
@@ -81,6 +84,9 @@ exports[`<CollapsibleNavGroupEnabled /> should render correctly 2`] = `
     <div
       class="eui-fullHeight left-navigation-wrapper"
     >
+      <div
+        class="searchBarIcon euiHeaderSectionItemButton"
+      />
       <div
         class="flex-1-container"
       />
@@ -112,6 +118,9 @@ exports[`<CollapsibleNavGroupEnabled /> should show use case nav when current na
           go back
         </button>
       </div>
+      <div
+        class="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPanel--noBorder searchBar-wrapper"
+      />
       <div
         class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder eui-yScroll flex-1-container"
         style="padding-top: 0px;"
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss
index c04d21131e5f..de3a6021b47d 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss
+++ b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss
@@ -114,4 +114,25 @@
     padding: 0 $euiSizeS;
     padding-left: $euiSize;
   }
+
+  .searchBar-wrapper {
+    padding: $euiSize;
+    padding-top: $euiSizeS;
+    background-color: transparent;
+    flex-grow: 0;
+
+    .searchInput {
+      background-color: transparentize($euiFormBackgroundColor, 0.5);
+    }
+
+    .searchInput:focus {
+      background-color: $euiFormBackgroundColor;
+    }
+  }
+
+  .searchBarIcon {
+    position: fixed;
+    top: $ouiHeaderChildSize;
+    left: 0;
+  }
 }
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
index 66257eb48d7b..b5adac4866d1 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
@@ -11,8 +11,8 @@ import useObservable from 'react-use/lib/useObservable';
 import * as Rx from 'rxjs';
 import classNames from 'classnames';
 import { WorkspacesStart } from 'src/core/public/workspace';
-import { ChromeNavControl, ChromeNavLink } from '../..';
 import { NavGroupType } from '../../../../types';
+import { ChromeNavControl, ChromeNavLink } from '../..';
 import { InternalApplicationStart } from '../../../application/types';
 import { HttpStart } from '../../../http';
 import { createEuiListItem } from './nav_link';
@@ -24,9 +24,11 @@ import {
 } from '../../nav_group';
 import { fulfillRegistrationLinksToChromeNavLinks, getVisibleUseCases, sortBy } from '../../utils';
 import { ALL_USE_CASE_ID, DEFAULT_APP_CATEGORIES } from '../../../../../core/utils';
+import { GlobalSearchCommand } from '../../global_search';
 import { CollapsibleNavTop } from './collapsible_nav_group_enabled_top';
 import { HeaderNavControls } from './header_nav_controls';
 import { NavGroups } from './collapsible_nav_groups';
+import { HeaderSearchBar, HeaderSearchBarIcon } from './header_search_bar';
 
 export interface CollapsibleNavGroupEnabledProps {
   appId$: InternalApplicationStart['currentAppId$'];
@@ -47,6 +49,7 @@ export interface CollapsibleNavGroupEnabledProps {
   setCurrentNavGroup: ChromeNavGroupServiceStartContract['setCurrentNavGroup'];
   capabilities: InternalApplicationStart['capabilities'];
   currentWorkspace$: WorkspacesStart['currentWorkspace$'];
+  globalSearchCommands?: GlobalSearchCommand[];
 }
 
 const titleForSeeAll = i18n.translate('core.ui.primaryNav.seeAllLabel', {
@@ -55,7 +58,7 @@ const titleForSeeAll = i18n.translate('core.ui.primaryNav.seeAllLabel', {
 
 enum NavWidth {
   Expanded = 270,
-  Collapsed = 48, // The Collasped width is supposed to be aligned with the hamburger icon on the top left navigation.
+  Collapsed = 48, // The Collapsed width is supposed to be aligned with the hamburger icon on the top left navigation.
 }
 
 export function CollapsibleNavGroupEnabled({
@@ -70,6 +73,7 @@ export function CollapsibleNavGroupEnabled({
   setCurrentNavGroup,
   capabilities,
   collapsibleNavHeaderRender,
+  globalSearchCommands,
   ...observables
 }: CollapsibleNavGroupEnabledProps) {
   const allNavLinks = useObservable(observables.navLinks$, []);
@@ -214,6 +218,24 @@ export function CollapsibleNavGroupEnabled({
             />
           </EuiPanel>
         )}
+        {!isNavOpen ? (
+          <div className="searchBarIcon euiHeaderSectionItemButton">
+            {globalSearchCommands && (
+              <HeaderSearchBarIcon globalSearchCommands={globalSearchCommands} />
+            )}
+          </div>
+        ) : (
+          <EuiPanel
+            hasBorder={false}
+            paddingSize="s"
+            hasShadow={false}
+            className="searchBar-wrapper"
+          >
+            {globalSearchCommands && (
+              <HeaderSearchBar globalSearchCommands={globalSearchCommands} />
+            )}
+          </EuiPanel>
+        )}
         {!isNavOpen ? null : (
           <EuiPanel
             hasBorder={false}
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled_top.tsx b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled_top.tsx
index 8a950ba87b84..628894864928 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled_top.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled_top.tsx
@@ -19,7 +19,6 @@ import { InternalApplicationStart } from 'src/core/public/application';
 import { createEuiListItem } from './nav_link';
 import { NavGroupItemInMap } from '../../nav_group';
 import { ChromeNavLink } from '../../nav_links';
-
 export interface CollapsibleNavTopProps {
   collapsibleNavHeaderRender?: () => JSX.Element | null;
   homeLink?: ChromeNavLink;
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index bb08a24305e6..ba2dd4282e84 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -81,6 +81,7 @@ import { HeaderLogo } from './header_logo';
 import { HeaderNavControls } from './header_nav_controls';
 import { HomeLoader } from './home_loader';
 import { RecentItems } from './recent_items';
+import { GlobalSearchCommand } from '../../global_search';
 
 export interface HeaderProps {
   http: HttpStart;
@@ -122,6 +123,7 @@ export interface HeaderProps {
   workspaceList$: Observable<WorkspaceObject[]>;
   currentWorkspace$: WorkspacesStart['currentWorkspace$'];
   useUpdatedHeader?: boolean;
+  globalSearchCommands?: GlobalSearchCommand[];
 }
 
 const hasValue = (value: any) => {
@@ -147,6 +149,7 @@ export function Header({
   navGroupEnabled,
   setCurrentNavGroup,
   useUpdatedHeader,
+  globalSearchCommands,
   ...observables
 }: HeaderProps) {
   const isVisible = useObservable(observables.isVisible$, false);
@@ -658,6 +661,7 @@ export function Header({
             setCurrentNavGroup={setCurrentNavGroup}
             capabilities={application.capabilities}
             currentWorkspace$={observables.currentWorkspace$}
+            globalSearchCommands={globalSearchCommands}
           />
         ) : (
           <CollapsibleNav
diff --git a/src/core/public/chrome/ui/header/header_search_bar.test.tsx b/src/core/public/chrome/ui/header/header_search_bar.test.tsx
new file mode 100644
index 000000000000..4762f85ba75c
--- /dev/null
+++ b/src/core/public/chrome/ui/header/header_search_bar.test.tsx
@@ -0,0 +1,220 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { act, fireEvent, render, waitFor } from '@testing-library/react';
+import { HeaderSearchBarIcon, HeaderSearchBar } from './header_search_bar';
+import { GlobalSearchCommand } from '../../global_search';
+import { EuiText } from '@elastic/eui';
+
+describe('<HeaderSearchBarIcon />', () => {
+  const searchFn = jest.fn().mockResolvedValue([]);
+  const searchFnBar = jest.fn().mockResolvedValue([]);
+  const globalSearchCommands: GlobalSearchCommand[] = [
+    {
+      id: 'foo',
+      type: 'PAGES',
+      run: searchFn,
+    },
+    {
+      id: 'bar',
+      type: 'PAGES',
+      run: searchFnBar,
+    },
+  ];
+
+  it('render HeaderSearchBarIcon correctly without search results', () => {
+    const { getByTestId, queryByText } = render(
+      <HeaderSearchBarIcon globalSearchCommands={globalSearchCommands} />
+    );
+    const searchIcon = getByTestId('globalSearch-leftNav-icon');
+    expect(searchIcon).toBeVisible();
+
+    fireEvent.click(searchIcon);
+
+    expect(getByTestId('search-input')).toBeVisible();
+
+    act(() => {
+      fireEvent.change(getByTestId('search-input'), {
+        target: { value: 'index' },
+      });
+    });
+
+    expect(searchFn).toHaveBeenCalled();
+
+    waitFor(() => {
+      expect(queryByText('No results found.')).toBeInTheDocument();
+    });
+  });
+
+  it('render HeaderSearchBarIcon correctly with search results', () => {
+    const { getByTestId, queryByText } = render(
+      <HeaderSearchBarIcon globalSearchCommands={globalSearchCommands} />
+    );
+    const searchIcon = getByTestId('globalSearch-leftNav-icon');
+    expect(searchIcon).toBeVisible();
+
+    fireEvent.click(searchIcon);
+
+    expect(getByTestId('search-input')).toBeVisible();
+
+    searchFn.mockResolvedValue([<EuiText>index page</EuiText>]);
+    act(() => {
+      fireEvent.change(getByTestId('search-input'), {
+        target: { value: 'index' },
+      });
+    });
+
+    expect(searchFn).toHaveBeenCalled();
+
+    waitFor(() => {
+      expect(queryByText('index page')).toBeInTheDocument();
+    });
+  });
+});
+
+describe('<HeaderSearchBar />', () => {
+  const searchFn = jest.fn().mockResolvedValue([]);
+  const searchFnBar = jest.fn().mockResolvedValue([]);
+  const searchFnBaz = jest.fn().mockResolvedValue([]);
+  const globalSearchCommands: GlobalSearchCommand[] = [
+    {
+      id: 'foo',
+      type: 'PAGES',
+      run: searchFn,
+    },
+    {
+      id: 'bar',
+      type: 'PAGES',
+      run: searchFnBar,
+    },
+    {
+      id: 'baz',
+      type: 'SAVED_OBJECTS',
+      run: searchFnBaz,
+    },
+  ];
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('render HeaderSearchBar with panel', () => {
+    const { getByTestId } = render(
+      <HeaderSearchBar globalSearchCommands={globalSearchCommands} panel />
+    );
+    const searchPanel = getByTestId('search-result-panel');
+    expect(searchPanel).toBeVisible();
+  });
+
+  it('render HeaderSearchBar with search result', () => {
+    const { getByTestId, queryByText } = render(
+      <HeaderSearchBar globalSearchCommands={globalSearchCommands} panel />
+    );
+    const searchPanel = getByTestId('search-result-panel');
+    expect(searchPanel).toBeVisible();
+
+    expect(getByTestId('search-input')).toBeVisible();
+
+    searchFn.mockResolvedValue([<EuiText>index page</EuiText>]);
+    searchFnBar.mockResolvedValue([<EuiText>index polices</EuiText>]);
+    act(() => {
+      fireEvent.change(getByTestId('search-input'), {
+        target: { value: 'index' },
+      });
+    });
+
+    expect(searchFn).toHaveBeenCalled();
+
+    // merge page results together
+    waitFor(() => {
+      expect(queryByText('index page')).toBeInTheDocument();
+      expect(queryByText('index polices')).toBeInTheDocument();
+    });
+  });
+
+  it('render HeaderSearchBar with reject search result', () => {
+    const { getByTestId, queryByText } = render(
+      <HeaderSearchBar globalSearchCommands={globalSearchCommands} panel />
+    );
+    const searchPanel = getByTestId('search-result-panel');
+    expect(searchPanel).toBeVisible();
+
+    expect(getByTestId('search-input')).toBeVisible();
+
+    searchFn.mockResolvedValue([<EuiText>index page</EuiText>]);
+    searchFnBar.mockRejectedValue(new Error('Async search error'));
+
+    act(() => {
+      fireEvent.change(getByTestId('search-input'), {
+        target: { value: 'index' },
+      });
+    });
+
+    expect(searchFn).toHaveBeenCalled();
+
+    // ignore reject and show pages for success search≠
+    waitFor(() => {
+      expect(queryByText('index page')).toBeInTheDocument();
+    });
+  });
+
+  it('render HeaderSearchBar with all reject search result', () => {
+    const { getByTestId, queryByText } = render(
+      <HeaderSearchBar globalSearchCommands={globalSearchCommands} panel />
+    );
+    const searchPanel = getByTestId('search-result-panel');
+    expect(searchPanel).toBeVisible();
+
+    expect(getByTestId('search-input')).toBeVisible();
+
+    searchFnBar.mockRejectedValue(new Error('Async search error'));
+    searchFn.mockRejectedValue(new Error('Async search error'));
+
+    act(() => {
+      fireEvent.change(getByTestId('search-input'), {
+        target: { value: 'index' },
+      });
+    });
+
+    expect(searchFn).toHaveBeenCalled();
+
+    // show no result for all reject search
+    waitFor(() => {
+      expect(queryByText('No results found.')).toBeInTheDocument();
+    });
+  });
+
+  it('render HeaderSearchBar with search saved objects', () => {
+    const { getByTestId, queryByText } = render(
+      <HeaderSearchBar globalSearchCommands={globalSearchCommands} panel />
+    );
+    const searchPanel = getByTestId('search-result-panel');
+    expect(searchPanel).toBeVisible();
+
+    expect(getByTestId('search-input')).toBeVisible();
+
+    searchFnBaz.mockResolvedValue([<div>saved objects</div>]);
+
+    act(() => {
+      fireEvent.change(getByTestId('search-input'), {
+        target: { value: '@index' },
+      });
+    });
+
+    // pages search command will not been invoked
+    globalSearchCommands.forEach((command) => {
+      if (command.type === 'SAVED_OBJECTS') {
+        expect(command.run).toHaveBeenCalled();
+      } else {
+        expect(command.run).not.toHaveBeenCalled();
+      }
+    });
+
+    waitFor(() => {
+      expect(queryByText('saved objects')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/src/core/public/chrome/ui/header/header_search_bar.tsx b/src/core/public/chrome/ui/header/header_search_bar.tsx
new file mode 100644
index 000000000000..023b5c19566b
--- /dev/null
+++ b/src/core/public/chrome/ui/header/header_search_bar.tsx
@@ -0,0 +1,249 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  EuiButtonIcon,
+  EuiFieldSearch,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiListGroup,
+  EuiListGroupItem,
+  EuiPanel,
+  EuiPopover,
+  EuiText,
+  EuiTitle,
+  EuiToolTip,
+} from '@elastic/eui';
+import React, { ReactNode, useRef, useState } from 'react';
+import { i18n } from '@osd/i18n';
+import {
+  GlobalSearchCommand,
+  SearchCommandKeyTypes,
+  SearchCommandTypes,
+} from '../../global_search';
+
+interface Props {
+  globalSearchCommands: GlobalSearchCommand[];
+  panel?: boolean;
+  onSearchResultClick?: () => void;
+}
+
+export const HeaderSearchBarIcon = ({ globalSearchCommands }: Props) => {
+  const [isSearchPopoverOpen, setIsSearchPopoverOpen] = useState(false);
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  return (
+    <EuiPopover
+      panelPaddingSize="s"
+      anchorPosition="downCenter"
+      repositionOnScroll={true}
+      isOpen={isSearchPopoverOpen}
+      closePopover={() => {
+        setIsSearchPopoverOpen(false);
+      }}
+      button={
+        <EuiToolTip
+          content={i18n.translate('core.globalSearch.icon.toolTip', {
+            defaultMessage: 'Search',
+          })}
+        >
+          <EuiButtonIcon
+            aria-label="search"
+            iconType="search"
+            color="text"
+            buttonRef={buttonRef}
+            data-test-subj="globalSearch-leftNav-icon"
+            onClick={() => {
+              setIsSearchPopoverOpen(!isSearchPopoverOpen);
+              // remove focus from the button to dismiss the tooltip
+              buttonRef.current?.blur();
+            }}
+          />
+        </EuiToolTip>
+      }
+    >
+      <EuiPanel
+        hasBorder={false}
+        hasShadow={false}
+        paddingSize="none"
+        style={{ minHeight: '300px', minWidth: '400px' }}
+      >
+        <HeaderSearchBar
+          globalSearchCommands={globalSearchCommands}
+          panel
+          onSearchResultClick={() => {
+            setIsSearchPopoverOpen(false);
+            buttonRef.current?.blur();
+          }}
+        />
+      </EuiPanel>
+    </EuiPopover>
+  );
+};
+
+export const HeaderSearchBar = ({ globalSearchCommands, panel, onSearchResultClick }: Props) => {
+  const [results, setResults] = useState([] as React.JSX.Element[]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+  const [panelWidth, setPanelWidth] = useState(0);
+  const inputElRef = useRef<HTMLElement | null>();
+  const inputRef = (node: HTMLElement | null) => (inputElRef.current = node);
+
+  const closePopover = () => {
+    setIsPopoverOpen(false);
+  };
+
+  const resultSection = (items: ReactNode[], sectionHeader: string) => {
+    return (
+      <EuiFlexGroup direction="column" gutterSize="xs">
+        <EuiFlexItem>
+          <EuiTitle size="s">
+            <EuiText size="xs" color="subdued">
+              {sectionHeader}
+            </EuiText>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          {items.length ? (
+            <EuiListGroup flush={true} gutterSize="none" maxWidth={false}>
+              {items.map((item, index) => (
+                <EuiListGroupItem key={index} label={item} size="s" />
+              ))}
+            </EuiListGroup>
+          ) : (
+            <EuiText color="subdued" size="xs">
+              {i18n.translate('core.globalSearch.emptyResult.description', {
+                defaultMessage: 'No results found.',
+              })}
+            </EuiText>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  };
+
+  const searchResultSections = results && (
+    <EuiFlexGroup direction="column" gutterSize="none">
+      {results.map((result) => (
+        <EuiFlexItem key={result.key}>{result}</EuiFlexItem>
+      ))}
+    </EuiFlexGroup>
+  );
+
+  const onSearch = async (value: string) => {
+    const filteredCommands = globalSearchCommands.filter((command) => {
+      const alias = SearchCommandTypes[command.type].alias;
+      return alias && value.startsWith(alias);
+    });
+
+    const defaultSearchCommands = globalSearchCommands.filter((command) => {
+      return !SearchCommandTypes[command.type].alias;
+    });
+
+    if (filteredCommands.length === 0) {
+      filteredCommands.push(...defaultSearchCommands);
+    }
+
+    if (value && filteredCommands && filteredCommands.length) {
+      setIsPopoverOpen(true);
+      setIsLoading(true);
+
+      const settleResults = await Promise.allSettled(
+        filteredCommands.map((command) => {
+          const callback = onSearchResultClick || closePopover;
+          const alias = SearchCommandTypes[command.type].alias;
+          const queryValue = alias ? value.replace(alias, '').trim() : value;
+          return command.run(queryValue, callback).then((items) => {
+            return { items, type: command.type };
+          });
+        })
+      );
+
+      const searchResults = settleResults
+        .filter((result) => result.status === 'fulfilled')
+        .map(
+          (result) =>
+            (result as PromiseFulfilledResult<{
+              items: ReactNode[];
+              type: SearchCommandKeyTypes;
+            }>).value
+        )
+        .reduce((acc, { items, type }) => {
+          return {
+            ...acc,
+            [type]: (acc[type] || []).concat(items),
+          };
+        }, {} as Record<SearchCommandKeyTypes, ReactNode[]>);
+
+      const sections = Object.entries(searchResults).map(([key, items]) => {
+        const sectionHeader = SearchCommandTypes[key as SearchCommandKeyTypes].description;
+        return resultSection(items, sectionHeader);
+      });
+
+      setIsLoading(false);
+      setResults(sections);
+    } else {
+      setIsPopoverOpen(false);
+      setResults([]);
+    }
+  };
+
+  const searchBar = (
+    <EuiFieldSearch
+      compressed
+      incremental
+      onSearch={onSearch}
+      fullWidth
+      placeholder={i18n.translate('core.globalSearch.input.placeholder', {
+        defaultMessage: 'Search the menu',
+      })}
+      isLoading={isLoading}
+      aria-label="Search the menus"
+      data-test-subj="search-input"
+      className="searchInput"
+      onFocus={() => {
+        const inputEl = inputElRef.current;
+        if (inputEl) {
+          const width = inputEl.getBoundingClientRect().width;
+          setPanelWidth(width);
+        }
+      }}
+    />
+  );
+
+  if (panel) {
+    return (
+      <EuiPanel
+        hasBorder={false}
+        hasShadow={false}
+        paddingSize="s"
+        data-test-subj="search-result-panel"
+      >
+        <EuiFlexGroup direction="column" gutterSize="s">
+          <EuiFlexItem>{searchBar}</EuiFlexItem>
+          <EuiFlexItem>{searchResultSections}</EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
+    );
+  } else {
+    return (
+      <EuiPopover
+        button={searchBar}
+        buttonRef={inputRef}
+        panelStyle={{ minWidth: panelWidth }}
+        zIndex={2000}
+        panelPaddingSize="s"
+        attachToAnchor={true}
+        ownFocus={false}
+        display="block"
+        isOpen={isPopoverOpen}
+        closePopover={() => {
+          setIsPopoverOpen(false);
+        }}
+      >
+        {searchResultSections}
+      </EuiPopover>
+    );
+  }
+};
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 0f177f672837..45fffa57ebe3 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -80,6 +80,7 @@ import {
   HeaderVariant,
   LinkItemType,
   getSortedNavLinks,
+  SearchCommandKeyTypes,
 } from './chrome';
 import { FatalErrorsSetup, FatalErrorsStart, FatalErrorInfo } from './fatal_errors';
 import { HttpSetup, HttpStart } from './http';
@@ -394,6 +395,7 @@ export {
   HeaderVariant,
   LinkItemType,
   getSortedNavLinks,
+  SearchCommandKeyTypes,
 };
 
 export { __osdBootstrap__ } from './osd_bootstrap';
@@ -404,6 +406,7 @@ export {
   WorkspacesService,
   WorkspaceObject,
   IWorkspaceClient,
+  IWorkspaceResponse,
 } from './workspace';
 
 export { debounce } from './utils';
diff --git a/src/core/public/locale_helper.test.ts b/src/core/public/locale_helper.test.ts
deleted file mode 100644
index 238dbced3892..000000000000
--- a/src/core/public/locale_helper.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLocaleInUrl } from './locale_helper';
-
-describe('getLocaleInUrl', () => {
-  beforeEach(() => {
-    // Clear any warnings before each test
-    delete (window as any).__localeWarning;
-  });
-
-  it('should return the locale from a valid query string', () => {
-    const url = 'http://localhost:5603/app/home?locale=en-US';
-    expect(getLocaleInUrl(url)).toBe('en-US');
-  });
-
-  it('should return the locale from a valid hash query string', () => {
-    const url = 'http://localhost:5603/app/home#/?locale=fr-FR';
-    expect(getLocaleInUrl(url)).toBe('fr-FR');
-  });
-
-  it('should return en for a URL without locale', () => {
-    const url = 'http://localhost:5603/app/home';
-    expect(getLocaleInUrl(url)).toBe('en');
-  });
-
-  it('should return en and set a warning for an invalid locale format in hash', () => {
-    const url = 'http://localhost:5603/app/home#/&locale=de-DE';
-    expect(getLocaleInUrl(url)).toBe('en');
-    expect((window as any).__localeWarning).toBeDefined();
-    expect((window as any).__localeWarning.title).toBe('Invalid URL Format');
-  });
-
-  it('should return en for an empty locale value', () => {
-    const url = 'http://localhost:5603/app/home?locale=';
-    expect(getLocaleInUrl(url)).toBe('en');
-  });
-
-  it('should handle URLs with other query parameters', () => {
-    const url = 'http://localhost:5603/app/home?param1=value1&locale=ja-JP&param2=value2';
-    expect(getLocaleInUrl(url)).toBe('ja-JP');
-  });
-
-  it('should handle URLs with other hash parameters', () => {
-    const url = 'http://localhost:5603/app/home#/route?param1=value1&locale=zh-CN&param2=value2';
-    expect(getLocaleInUrl(url)).toBe('zh-CN');
-  });
-});
diff --git a/src/core/public/locale_helper.ts b/src/core/public/locale_helper.ts
deleted file mode 100644
index 38a734a523b1..000000000000
--- a/src/core/public/locale_helper.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Extracts the locale value from a given URL.
- *
- * This function looks for the 'locale' parameter in either the main query string
- * or in the hash part of the URL. It supports two valid formats:
- * 1. As a regular query parameter: "?locale=xx-XX"
- * 2. In the hash with a proper query string: "#/?locale=xx-XX"
- *
- * If an invalid format is detected, it sets a warning message on the window object.
- *
- * @param url - The URL to extract the locale from
- * @returns The locale value if found and valid, or null otherwise
- */
-export function getLocaleInUrl(url: string): string | null {
-  let urlObject: URL;
-  // Attempt to parse the URL, return null if invalid
-  try {
-    urlObject = new URL(url, window.location.origin);
-  } catch (error) {
-    setInvalidUrlWarning();
-    return null;
-  }
-
-  let localeValue: string | null = null;
-
-  // Check for locale in the main query string
-  if (urlObject.searchParams.has('locale')) {
-    localeValue = urlObject.searchParams.get('locale');
-  }
-  // Check for locale in the hash, but only if it's in proper query string format
-  else if (urlObject.hash.includes('?')) {
-    const hashParams = new URLSearchParams(urlObject.hash.split('?')[1]);
-    if (hashParams.has('locale')) {
-      localeValue = hashParams.get('locale');
-    }
-  }
-
-  // Check for non standard query format:
-  if (localeValue === null && url.includes('&locale=')) {
-    setInvalidUrlWithLocaleWarning();
-    return 'en';
-  }
-
-  // Return the locale value if found, or 'en' if not found
-  return localeValue && localeValue.trim() !== '' ? localeValue : 'en';
-}
-
-function setInvalidUrlWarning(): void {
-  (window as any).__localeWarning = {
-    title: 'Invalid URL Format',
-    text: 'The provided URL is not in a valid format.',
-  };
-}
-
-function setInvalidUrlWithLocaleWarning(): void {
-  (window as any).__localeWarning = {
-    title: 'Invalid URL Format',
-    text:
-      'The locale parameter is not in a valid URL format. ' +
-      'Use either "?locale=xx-XX" in the main URL or "#/?locale=xx-XX" in the hash. ' +
-      'For example: "yourapp.com/page?locale=en-US" or "yourapp.com/page#/?locale=en-US".',
-  };
-}
diff --git a/src/core/public/osd_bootstrap.test.ts b/src/core/public/osd_bootstrap.test.ts
index 7630b4441ab6..b51d05dd9312 100644
--- a/src/core/public/osd_bootstrap.test.ts
+++ b/src/core/public/osd_bootstrap.test.ts
@@ -28,23 +28,10 @@
  * under the License.
  */
 
-import {
-  apmSystem,
-  fatalErrorMock,
-  i18nLoad,
-  i18nSetLocale,
-  consoleWarnMock,
-} from './osd_bootstrap.test.mocks';
+import { apmSystem, fatalErrorMock, i18nLoad } from './osd_bootstrap.test.mocks';
 import { __osdBootstrap__ } from './';
-import { getLocaleInUrl } from './locale_helper';
-
-jest.mock('./locale_helper', () => ({
-  getLocaleInUrl: jest.fn(),
-}));
 
 describe('osd_bootstrap', () => {
-  let originalWindowLocation: Location;
-
   beforeAll(() => {
     const metadata = {
       branding: { darkMode: 'true' },
@@ -52,22 +39,12 @@ describe('osd_bootstrap', () => {
       vars: { apmConfig: null },
     };
     // eslint-disable-next-line no-unsanitized/property
-    document.body.innerHTML = `<osd-injected-metadata data=${JSON.stringify(
-      metadata
-    )}> </osd-injected-metadata>`;
-
-    originalWindowLocation = window.location;
-    delete (window as any).location;
-    window.location = { ...originalWindowLocation, href: 'http://localhost' };
+    document.body.innerHTML = `<osd-injected-metadata data=${JSON.stringify(metadata)}>
+</osd-injected-metadata>`;
   });
 
   beforeEach(() => {
     jest.clearAllMocks();
-    (getLocaleInUrl as jest.Mock).mockReturnValue(null);
-  });
-
-  afterAll(() => {
-    window.location = originalWindowLocation;
   });
 
   it('does not report a fatal error if apm load fails', async () => {
@@ -87,39 +64,4 @@ describe('osd_bootstrap', () => {
 
     expect(fatalErrorMock.add).toHaveBeenCalledTimes(1);
   });
-
-  it('sets locale from URL if present', async () => {
-    (getLocaleInUrl as jest.Mock).mockReturnValue('fr');
-    window.location.href = 'http://localhost/?locale=fr';
-
-    await __osdBootstrap__();
-
-    expect(i18nSetLocale).toHaveBeenCalledWith('fr');
-    expect(i18nLoad).toHaveBeenCalledWith('http://localhost/translations/fr.json');
-  });
-
-  it('sets default locale if not present in URL', async () => {
-    await __osdBootstrap__();
-
-    expect(i18nSetLocale).toHaveBeenCalledWith('en');
-    expect(i18nLoad).toHaveBeenCalledWith('http://localhost/translations/en.json');
-  });
-
-  it('displays locale warning if set', async () => {
-    (window as any).__localeWarning = { title: 'Locale Warning', text: 'Invalid locale' };
-
-    await __osdBootstrap__();
-
-    expect(consoleWarnMock).toHaveBeenCalledWith('Locale Warning: Invalid locale');
-    expect((window as any).__localeWarning).toBeUndefined();
-  });
-
-  it('displays i18n warning if set', async () => {
-    (window as any).__i18nWarning = { title: 'i18n Warning', text: 'Translation issue' };
-
-    await __osdBootstrap__();
-
-    expect(consoleWarnMock).toHaveBeenCalledWith('i18n Warning: Translation issue');
-    expect((window as any).__i18nWarning).toBeUndefined();
-  });
 });
diff --git a/src/core/public/osd_bootstrap.ts b/src/core/public/osd_bootstrap.ts
index 5190fdc37e21..2c614b279891 100644
--- a/src/core/public/osd_bootstrap.ts
+++ b/src/core/public/osd_bootstrap.ts
@@ -31,7 +31,6 @@
 import { i18n } from '@osd/i18n';
 import { CoreSystem } from './core_system';
 import { ApmSystem } from './apm_system';
-import { getLocaleInUrl } from './locale_helper';
 
 /** @internal */
 export async function __osdBootstrap__() {
@@ -39,33 +38,6 @@ export async function __osdBootstrap__() {
     document.querySelector('osd-injected-metadata')!.getAttribute('data')!
   );
 
-  // Extract the locale from the URL if present
-  const currentLocale = i18n.getLocale();
-  const urlLocale = getLocaleInUrl(window.location.href);
-
-  if (urlLocale && urlLocale !== currentLocale) {
-    // If a locale is specified in the URL, update the i18n settings
-    // This enables dynamic language switching
-    // Note: This works in conjunction with server-side changes:
-    // 1. The server registers all available translation files at startup
-    // 2. A server route handles requests for specific locale translations
-
-    // Set the locale in the i18n core
-    // This will affect all subsequent i18n.translate() calls
-    i18n.setLocale(urlLocale);
-
-    // Modify the translationsUrl to include the new locale
-    // This ensures that the correct translation file is requested from the server
-    // The replace function changes the locale in the URL, e.g.,
-    // from '/translations/en.json' to '/translations/zh-CN.json'
-    injectedMetadata.i18n.translationsUrl = injectedMetadata.i18n.translationsUrl.replace(
-      /\/([^/]+)\.json$/,
-      `/${urlLocale}.json`
-    );
-  } else if (!urlLocale) {
-    i18n.setLocale('en');
-  }
-
   const globals: any = typeof window === 'undefined' ? {} : window;
   const themeTag: string = globals.__osdThemeTag__ || '';
 
diff --git a/src/core/public/workspace/index.ts b/src/core/public/workspace/index.ts
index a605aff02fb1..59e3bb286e61 100644
--- a/src/core/public/workspace/index.ts
+++ b/src/core/public/workspace/index.ts
@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export {
-  WorkspacesStart,
-  WorkspacesService,
-  WorkspacesSetup,
-  WorkspaceObject,
-  IWorkspaceClient,
-} from './workspaces_service';
+export { WorkspacesStart, WorkspacesService, WorkspacesSetup } from './workspaces_service';
+
+export { IWorkspaceClient, IWorkspaceResponse, WorkspaceObject } from './types';
diff --git a/src/core/public/workspace/types.ts b/src/core/public/workspace/types.ts
new file mode 100644
index 000000000000..fbb26287914b
--- /dev/null
+++ b/src/core/public/workspace/types.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { WorkspaceAttribute } from '../../types';
+
+export type WorkspaceObject = WorkspaceAttribute & { readonly?: boolean };
+
+export type IWorkspaceResponse<T> =
+  | {
+      result: T;
+      success: true;
+    }
+  | {
+      success: false;
+      error?: string;
+    };
+
+export interface AssociationResult {
+  id: string;
+  error?: string;
+}
+
+/**
+ * This interface representing a client for managing workspace-related operations.
+ * Workspace client should implement this interface.
+ *
+ * TODO: Refactor the current workspace client implementation in workspace plugin to add the missing operations to this interface
+ */
+export interface IWorkspaceClient {
+  /**
+   * copy saved objects to target workspace
+   *
+   * @param {Array<{ id: string; type: string }>} objects
+   * @param {string} targetWorkspace
+   * @param {boolean} includeReferencesDeep
+   * @returns {Promise<IResponse<any>>} result for this operation
+   */
+  copy(objects: any[], targetWorkspace: string, includeReferencesDeep?: boolean): Promise<any>;
+
+  /**
+   * Associates a list of objects with the given workspace ID.
+   *
+   * This method takes a workspace ID and an array of objects, where each object contains
+   * an `id` and `type`. It attempts to associate each object with the specified workspace.
+   * If the association succeeds, the object is included in the result without an error.
+   * If there is an issue associating an object, an error message is returned for that object.
+   *
+   * @returns A promise that resolves to a response object containing an array of results for each object.
+   *          Each result will include the object's `id` and, if there was an error during association, an `error` field
+   *          with the error message.
+   */
+  associate(
+    savedObjects: Array<{ id: string; type: string }>,
+    workspaceId: string
+  ): Promise<IWorkspaceResponse<AssociationResult[]>>;
+
+  /**
+   * Dissociates a list of objects from the given workspace ID.
+   *
+   * This method takes a workspace ID and an array of objects, where each object contains
+   * an `id` and `type`. It attempts to dissociate each object from the specified workspace.
+   * If the dissociation succeeds, the object is included in the result without an error.
+   * If there is an issue dissociating an object, an error message is returned for that object.
+   *
+   * @returns A promise that resolves to a response object containing an array of results for each object.
+   *          Each result will include the object's `id` and, if there was an error during dissociation, an `error` field
+   *          with the error message.
+   */
+  dissociate(
+    savedObjects: Array<{ id: string; type: string }>,
+    workspaceId: string
+  ): Promise<IWorkspaceResponse<AssociationResult[]>>;
+
+  ui(): WorkspaceUI;
+}
+
+interface DataSourceAssociationProps {
+  excludedDataSourceIds: string[];
+  onComplete?: () => void;
+  onError?: () => void;
+}
+
+export interface WorkspaceUI {
+  DataSourceAssociation: (props: DataSourceAssociationProps) => JSX.Element;
+}
diff --git a/src/core/public/workspace/workspaces_service.mock.ts b/src/core/public/workspace/workspaces_service.mock.ts
index ae0f4deb1d68..3645e5616d01 100644
--- a/src/core/public/workspace/workspaces_service.mock.ts
+++ b/src/core/public/workspace/workspaces_service.mock.ts
@@ -6,7 +6,8 @@
 import { BehaviorSubject } from 'rxjs';
 import type { PublicMethodsOf } from '@osd/utility-types';
 
-import { WorkspacesService, WorkspaceObject, IWorkspaceClient } from './workspaces_service';
+import { IWorkspaceClient, WorkspaceObject } from './types';
+import { WorkspacesService } from './workspaces_service';
 
 const createWorkspacesSetupContractMock = () => {
   const currentWorkspaceId$ = new BehaviorSubject<string>('');
diff --git a/src/core/public/workspace/workspaces_service.test.ts b/src/core/public/workspace/workspaces_service.test.ts
index 076100c8f558..609b1891c3a8 100644
--- a/src/core/public/workspace/workspaces_service.test.ts
+++ b/src/core/public/workspace/workspaces_service.test.ts
@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  WorkspacesService,
-  WorkspacesSetup,
-  WorkspacesStart,
-  IWorkspaceClient,
-} from './workspaces_service';
+import { IWorkspaceClient } from './types';
+import { WorkspacesService, WorkspacesSetup, WorkspacesStart } from './workspaces_service';
 
 describe('WorkspacesService', () => {
   let workspaces: WorkspacesService;
@@ -43,7 +39,12 @@ describe('WorkspacesService', () => {
   });
 
   it('client is updated when set client', () => {
-    const client: IWorkspaceClient = { copy: jest.fn() };
+    const client: IWorkspaceClient = {
+      copy: jest.fn(),
+      associate: jest.fn(),
+      dissociate: jest.fn(),
+      ui: jest.fn(),
+    };
     workspacesSetUp.setClient(client);
     expect(workspacesStart.client$.value).toEqual(client);
   });
diff --git a/src/core/public/workspace/workspaces_service.ts b/src/core/public/workspace/workspaces_service.ts
index 6f934c294eba..70b17896264f 100644
--- a/src/core/public/workspace/workspaces_service.ts
+++ b/src/core/public/workspace/workspaces_service.ts
@@ -6,13 +6,8 @@
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { isEqual } from 'lodash';
 
-import { CoreService, WorkspaceAttribute } from '../../types';
-
-export type WorkspaceObject = WorkspaceAttribute & { readonly?: boolean };
-
-export interface IWorkspaceClient {
-  copy(objects: any[], targetWorkspace: string, includeReferencesDeep?: boolean): Promise<any>;
-}
+import { CoreService } from '../../types';
+import { IWorkspaceClient, WorkspaceObject } from './types';
 
 interface WorkspaceObservables {
   /**
diff --git a/src/core/server/rendering/rendering_service.test.ts b/src/core/server/rendering/rendering_service.test.ts
index ac37ea595787..7ec3320c8791 100644
--- a/src/core/server/rendering/rendering_service.test.ts
+++ b/src/core/server/rendering/rendering_service.test.ts
@@ -29,6 +29,21 @@
  */
 
 import { load } from 'cheerio';
+import { i18nLoader } from '@osd/i18n';
+
+jest.mock('@osd/i18n', () => {
+  const originalModule = jest.requireActual('@osd/i18n');
+  return {
+    ...originalModule,
+    i18nLoader: {
+      getRegisteredLocales: jest.fn(),
+      getTranslationsByLocale: jest.fn(),
+      isRegisteredLocale: jest.fn(),
+    },
+  };
+});
+
+const i18nLoaderMock = jest.mocked(i18nLoader, true);
 
 import { httpServerMock } from '../http/http_server.mocks';
 import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
@@ -586,6 +601,34 @@ describe('RenderingService', () => {
 
         expect(data).toMatchSnapshot(INJECTED_METADATA);
       });
+
+      it('renders "core" page driven by overridden locale', async () => {
+        i18nLoaderMock.isRegisteredLocale.mockReturnValue(true);
+        const content = await render(
+          createOpenSearchDashboardsRequest({ query: { locale: 'TR-tr' } }),
+          uiSettings,
+          {}
+        );
+        const dom = load(content);
+        const $elStyle = dom('html');
+
+        expect(i18nLoader.isRegisteredLocale).toHaveBeenCalledWith('tr-TR');
+        expect($elStyle.attr('lang')).toBe('tr-TR');
+      });
+
+      it('renders "core" page driven by invalid overridden locale', async () => {
+        i18nLoaderMock.isRegisteredLocale.mockReturnValue(false);
+        const content = await render(
+          createOpenSearchDashboardsRequest({ query: { locale: 'xx-XX' } }),
+          uiSettings,
+          {}
+        );
+        const dom = load(content);
+        const $elStyle = dom('html');
+
+        expect(i18nLoader.isRegisteredLocale).toHaveBeenCalledWith('xx-XX');
+        expect($elStyle.attr('lang')).toBe('en');
+      });
     });
   });
 
diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx
index 5c94a92479f4..e5f4cbfea99c 100644
--- a/src/core/server/rendering/rendering_service.tsx
+++ b/src/core/server/rendering/rendering_service.tsx
@@ -31,7 +31,7 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { first, take } from 'rxjs/operators';
-import { i18n } from '@osd/i18n';
+import { i18n, i18nLoader } from '@osd/i18n';
 import { Agent as HttpsAgent } from 'https';
 import { themeVersionValueMap, themeTagDetailMap, ThemeTag } from '@osd/ui-shared-deps';
 
@@ -122,6 +122,15 @@ export class RenderingService {
           opensearchDashboardsConfig as OpenSearchDashboardsConfigType
         );
 
+        let locale = i18n.getLocale();
+        const localeOverride = (request.query as any)?.locale?.trim?.();
+        if (localeOverride) {
+          const normalizedLocale = i18n.normalizeLocale(localeOverride);
+          if (i18nLoader.isRegisteredLocale(normalizedLocale)) {
+            locale = normalizedLocale;
+          }
+        }
+
         const dynamicConfigStartServices = await dynamicConfig.getStartService();
 
         const metadata: RenderingMetadata = {
@@ -129,7 +138,7 @@ export class RenderingService {
           uiPublicUrl,
           bootstrapScriptUrl: `${basePath}/bootstrap.js`,
           i18n: i18n.translate,
-          locale: i18n.getLocale(),
+          locale,
           darkMode,
           themeVersion,
           injectedMetadata: {
@@ -141,7 +150,7 @@ export class RenderingService {
             env,
             anonymousStatusPage: status.isStatusPageAnonymous(),
             i18n: {
-              translationsUrl: `${basePath}/translations/${i18n.getLocale()}.json`,
+              translationsUrl: `${basePath}/translations/${locale}.json`,
             },
             csp: { warnLegacyBrowsers: http.csp.warnLegacyBrowsers },
             vars: vars ?? {},
diff --git a/src/core/server/saved_objects/service/saved_objects_client.mock.ts b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
index db7c4771c4f7..ca66c40c4aaf 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.mock.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
@@ -31,22 +31,22 @@
 import { SavedObjectsClientContract } from '../types';
 import { SavedObjectsErrorHelpers } from './lib/errors';
 
-const create = () =>
-  (({
-    errors: SavedObjectsErrorHelpers,
-    create: jest.fn(),
-    bulkCreate: jest.fn(),
-    checkConflicts: jest.fn(),
-    bulkUpdate: jest.fn(),
-    delete: jest.fn(),
-    bulkGet: jest.fn(),
-    find: jest.fn(),
-    get: jest.fn(),
-    update: jest.fn(),
-    addToNamespaces: jest.fn(),
-    deleteFromNamespaces: jest.fn(),
-    addToWorkspaces: jest.fn(),
-    deleteFromWorkspaces: jest.fn(),
-  } as unknown) as jest.Mocked<SavedObjectsClientContract>);
+const create = (): jest.Mocked<SavedObjectsClientContract> => ({
+  errors: SavedObjectsErrorHelpers as jest.Mocked<SavedObjectsClientContract>['errors'],
+  create: jest.fn(),
+  bulkCreate: jest.fn(),
+  checkConflicts: jest.fn(),
+  bulkUpdate: jest.fn(),
+  delete: jest.fn(),
+  bulkGet: jest.fn(),
+  find: jest.fn(),
+  get: jest.fn(),
+  update: jest.fn(),
+  addToNamespaces: jest.fn(),
+  deleteFromNamespaces: jest.fn(),
+  addToWorkspaces: jest.fn(),
+  deleteFromWorkspaces: jest.fn(),
+  deleteByWorkspace: jest.fn(),
+});
 
 export const savedObjectsClientMock = { create };
diff --git a/src/core/server/utils/acl_auditor.test.ts b/src/core/server/utils/acl_auditor.test.ts
new file mode 100644
index 000000000000..a77afb18ca30
--- /dev/null
+++ b/src/core/server/utils/acl_auditor.test.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { loggerMock } from '../logging/logger.mock';
+import { httpServerMock } from '../mocks';
+import {
+  initializeACLAuditor,
+  getACLAuditor,
+  cleanUpACLAuditor,
+  ACLAuditorStateKey,
+} from './acl_auditor';
+
+describe('#getACLAuditor', () => {
+  it('should be able to get ACL auditor if request initialized', () => {
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const uninilizedMockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const mockedLogger = loggerMock.create();
+    initializeACLAuditor(mockRequest, mockedLogger);
+    expect(getACLAuditor(mockRequest)).not.toBeFalsy();
+    expect(getACLAuditor(uninilizedMockRequest)).toBeFalsy();
+  });
+});
+
+describe('#cleanUpACLAuditor', () => {
+  it('should be able to destroy the auditor', () => {
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const mockedLogger = loggerMock.create();
+    initializeACLAuditor(mockRequest, mockedLogger);
+    expect(getACLAuditor(mockRequest)).not.toBeFalsy();
+    cleanUpACLAuditor(mockRequest);
+    expect(getACLAuditor(mockRequest)).toBeFalsy();
+  });
+});
+
+describe('#ACLAuditor', () => {
+  it('should log error when auditor value is not correct', () => {
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const mockedLogger = loggerMock.create();
+    initializeACLAuditor(mockRequest, mockedLogger);
+    const ACLAuditorInstance = getACLAuditor(mockRequest);
+    ACLAuditorInstance?.increment(ACLAuditorStateKey.DATABASE_OPERATION, 1);
+    ACLAuditorInstance?.checkout();
+    expect(
+      mockedLogger.error.mock.calls[0][0].toString().startsWith('[ACLCounterCheckoutFailed]')
+    ).toEqual(true);
+    ACLAuditorInstance?.checkout();
+    expect(mockedLogger.error).toBeCalledTimes(1);
+  });
+});
diff --git a/src/core/server/utils/acl_auditor.ts b/src/core/server/utils/acl_auditor.ts
new file mode 100644
index 000000000000..5ca87de5ea85
--- /dev/null
+++ b/src/core/server/utils/acl_auditor.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OpenSearchDashboardsRequest, ensureRawRequest } from '../http/router';
+import { Logger } from '../logging';
+
+const ACLAuditorKey = Symbol('ACLAuditor');
+
+export const ACLAuditorStateKey = {
+  VALIDATE_SUCCESS: 'validateSuccess',
+  VALIDATE_FAILURE: 'validateFailure',
+  DATABASE_OPERATION: 'databaseOperation',
+} as const;
+
+const defaultState = {
+  [ACLAuditorStateKey.VALIDATE_SUCCESS]: 0,
+  [ACLAuditorStateKey.VALIDATE_FAILURE]: 0,
+  [ACLAuditorStateKey.DATABASE_OPERATION]: 0,
+};
+
+type ValueOf<T> = T[keyof T];
+
+class ACLAuditor {
+  private state = { ...defaultState };
+
+  constructor(private logger: Logger) {}
+
+  reset = () => {
+    this.state = { ...defaultState };
+  };
+
+  increment = (key: ValueOf<typeof ACLAuditorStateKey>, count: number) => {
+    if (typeof count !== 'number' || !this.state.hasOwnProperty(key)) {
+      return;
+    }
+
+    this.state[key] = this.state[key] + count;
+  };
+
+  checkout = (requestInfo?: string) => {
+    /**
+     * VALIDATE_FAILURE represents the count for unauthorized call to a specific objects
+     * VALIDATE_SUCCESS represents the count for authorized call to a specific objects
+     * DATABASE_OPERATION represents the count for operations call to the database.
+     *
+     * Normally the operations call to the database should always <= the AuthZ check(VALIDATE_FAILURE + VALIDATE_SUCCESS)
+     * If DATABASE_OPERATION > AuthZ check, it means we have somewhere bypasses the AuthZ check and we should audit this bypass behavior.
+     */
+    if (
+      this.state[ACLAuditorStateKey.VALIDATE_FAILURE] +
+        this.state[ACLAuditorStateKey.VALIDATE_SUCCESS] <
+      this.state[ACLAuditorStateKey.DATABASE_OPERATION]
+    ) {
+      this.logger.error(
+        `[ACLCounterCheckoutFailed] counter state: ${JSON.stringify(this.state)}, ${
+          requestInfo ? `requestInfo: ${requestInfo}` : ''
+        }`
+      );
+    }
+
+    this.reset();
+  };
+
+  getState = () => this.state;
+}
+
+interface AppState {
+  [ACLAuditorKey]?: ACLAuditor;
+}
+
+/**
+ * This function will be used to initialize a new app state to the request
+ *
+ * @param request OpenSearchDashboardsRequest
+ * @returns void
+ */
+export const initializeACLAuditor = (request: OpenSearchDashboardsRequest, logger: Logger) => {
+  const rawRequest = ensureRawRequest(request);
+  const appState: AppState = rawRequest.app;
+  const ACLCounterInstance = appState[ACLAuditorKey];
+
+  if (ACLCounterInstance) {
+    return;
+  }
+
+  appState[ACLAuditorKey] = new ACLAuditor(logger);
+};
+
+export const getACLAuditor = (request: OpenSearchDashboardsRequest): ACLAuditor | undefined => {
+  return (ensureRawRequest(request).app as AppState)[ACLAuditorKey];
+};
+
+export const cleanUpACLAuditor = (request: OpenSearchDashboardsRequest) => {
+  (ensureRawRequest(request).app as AppState)[ACLAuditorKey] = undefined;
+};
diff --git a/src/core/server/utils/client_call_auditor.test.ts b/src/core/server/utils/client_call_auditor.test.ts
new file mode 100644
index 000000000000..85f49c8e4345
--- /dev/null
+++ b/src/core/server/utils/client_call_auditor.test.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { httpServerMock } from '../../../core/server/mocks';
+import {
+  initializeClientCallAuditor,
+  getClientCallAuditor,
+  CLIENT_CALL_AUDITOR_KEY,
+  cleanUpClientCallAuditor,
+} from './client_call_auditor';
+
+describe('#getClientCallAuditor', () => {
+  it('should be able to get clientCallAuditor if request initialized', () => {
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const uninilizedMockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    initializeClientCallAuditor(mockRequest);
+    expect(getClientCallAuditor(mockRequest)).not.toBeFalsy();
+    expect(getClientCallAuditor(uninilizedMockRequest)).toBeFalsy();
+  });
+});
+
+describe('#cleanUpClientCallAuditor', () => {
+  it('should be able to destroy the auditor', () => {
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    initializeClientCallAuditor(mockRequest);
+    expect(getClientCallAuditor(mockRequest)).not.toBeFalsy();
+    cleanUpClientCallAuditor(mockRequest);
+    expect(getClientCallAuditor(mockRequest)).toBeFalsy();
+  });
+});
+
+describe('#ClientCallAuditor', () => {
+  it('should return false when auditor incoming not equal outgoing', () => {
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    initializeClientCallAuditor(mockRequest);
+    const ACLAuditorInstance = getClientCallAuditor(mockRequest);
+    ACLAuditorInstance?.increment(CLIENT_CALL_AUDITOR_KEY.incoming);
+    expect(ACLAuditorInstance?.isAsyncClientCallsBalanced()).toEqual(false);
+  });
+});
diff --git a/src/core/server/utils/client_call_auditor.ts b/src/core/server/utils/client_call_auditor.ts
new file mode 100644
index 000000000000..405b103b4360
--- /dev/null
+++ b/src/core/server/utils/client_call_auditor.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OpenSearchDashboardsRequest, ensureRawRequest } from '../http/router';
+
+const clientCallAuditorKey = Symbol('clientCallAuditor');
+
+interface AppState {
+  [clientCallAuditorKey]?: ClientCallAuditor;
+}
+
+export const CLIENT_CALL_AUDITOR_KEY = {
+  incoming: 'incoming',
+  outgoing: 'outgoing',
+} as const;
+
+/**
+ * This class will be used to audit all the async calls to saved objects client.
+ * For example, `/api/sample_data` will call savedObjectsClient.get() 3 times parallely and for ACL auditor,
+ * it should only `checkout` when the incoming calls equal outgoing call.
+ */
+class ClientCallAuditor {
+  private state: {
+    incoming?: number;
+    outgoing?: number;
+  } = {};
+  increment(key: keyof typeof CLIENT_CALL_AUDITOR_KEY) {
+    this.state[key] = (this.state[key] || 0) + 1;
+  }
+  isAsyncClientCallsBalanced() {
+    return this.state.incoming === this.state.outgoing;
+  }
+}
+
+/**
+ * This function will be used to initialize a new app state to the request
+ *
+ * @param request OpenSearchDashboardsRequest
+ * @returns void
+ */
+export const initializeClientCallAuditor = (request: OpenSearchDashboardsRequest) => {
+  const rawRequest = ensureRawRequest(request);
+  const appState: AppState = rawRequest.app;
+  const clientCallAuditorInstance = appState[clientCallAuditorKey];
+
+  if (clientCallAuditorInstance) {
+    return;
+  }
+
+  appState[clientCallAuditorKey] = new ClientCallAuditor();
+};
+
+export const getClientCallAuditor = (
+  request: OpenSearchDashboardsRequest
+): ClientCallAuditor | undefined => {
+  return (ensureRawRequest(request).app as AppState)[clientCallAuditorKey];
+};
+
+export const cleanUpClientCallAuditor = (request: OpenSearchDashboardsRequest) => {
+  (ensureRawRequest(request).app as AppState)[clientCallAuditorKey] = undefined;
+};
diff --git a/src/core/server/utils/index.ts b/src/core/server/utils/index.ts
index 64f8379a46e2..43bcbe52e6ac 100644
--- a/src/core/server/utils/index.ts
+++ b/src/core/server/utils/index.ts
@@ -35,3 +35,15 @@ export * from './streams';
 export { getPrincipalsFromRequest } from './auth_info';
 export { getWorkspaceIdFromUrl, cleanWorkspaceId } from '../../utils';
 export { updateWorkspaceState, getWorkspaceState } from './workspace';
+export {
+  ACLAuditorStateKey,
+  initializeACLAuditor,
+  getACLAuditor,
+  cleanUpACLAuditor,
+} from './acl_auditor';
+export {
+  CLIENT_CALL_AUDITOR_KEY,
+  getClientCallAuditor,
+  initializeClientCallAuditor,
+  cleanUpClientCallAuditor,
+} from './client_call_auditor';
diff --git a/src/core/utils/default_nav_groups.ts b/src/core/utils/default_nav_groups.ts
index b58bd43e5b08..9f42356c09b8 100644
--- a/src/core/utils/default_nav_groups.ts
+++ b/src/core/utils/default_nav_groups.ts
@@ -23,6 +23,7 @@ const defaultNavGroups = {
     }),
     order: 1000,
     type: NavGroupType.SYSTEM,
+    icon: 'database',
   },
   settingsAndSetup: {
     id: 'settingsAndSetup',
@@ -34,6 +35,7 @@ const defaultNavGroups = {
     }),
     order: 2000,
     type: NavGroupType.SYSTEM,
+    icon: 'gear',
   },
   all: {
     id: ALL_USE_CASE_ID,
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index 4e699591605f..759cc2dac6fd 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -49,7 +49,8 @@ import { getApmConfig } from '../apm';
  */
 export function uiRenderMixin(osdServer, server, config) {
   const translationsCache = { translations: null, hash: null };
-  const defaultLocale = i18n.getLocale() || 'en'; // Fallback to 'en' if no default locale is set
+  // `i18n.getLocale` will always return a value; the 'en' is just to accommodate tests
+  const defaultLocale = i18n.getLocale() || 'en';
 
   // Route handler for serving translation files.
   // This handler supports two scenarios:
@@ -61,8 +62,7 @@ export function uiRenderMixin(osdServer, server, config) {
     config: { auth: false },
     handler: async (request, h) => {
       const { locale } = request.params;
-      const normalizedLocale = locale.toLowerCase();
-      const registeredLocales = i18nLoader.getRegisteredLocales().map((l) => l.toLowerCase());
+      const normalizedLocale = i18n.normalizeLocale(locale);
       let warning = null;
 
       // Function to get or create cached translations
@@ -79,12 +79,12 @@ export function uiRenderMixin(osdServer, server, config) {
 
       let cachedTranslations;
 
-      if (normalizedLocale === defaultLocale.toLowerCase()) {
+      if (normalizedLocale === defaultLocale) {
         // Default locale
         cachedTranslations = await getCachedTranslations(defaultLocale, () =>
           i18n.getTranslation()
         );
-      } else if (registeredLocales.includes(normalizedLocale)) {
+      } else if (i18nLoader.isRegisteredLocale(normalizedLocale)) {
         // Other registered locales
         cachedTranslations = await getCachedTranslations(normalizedLocale, () =>
           i18nLoader.getTranslationsByLocale(locale)
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.test.js b/src/legacy/ui/ui_render/ui_render_mixin.test.js
index 81f8a9f9a696..e96a3ce77a8e 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.test.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.test.js
@@ -6,17 +6,22 @@
 import { uiRenderMixin } from './ui_render_mixin';
 
 // Mock dependencies
-jest.mock('@osd/i18n', () => ({
-  i18n: {
-    getLocale: jest.fn(),
-    getTranslation: jest.fn(),
-    translate: jest.fn((key, { defaultMessage }) => defaultMessage),
-  },
-  i18nLoader: {
-    getRegisteredLocales: jest.fn(),
-    getTranslationsByLocale: jest.fn(),
-  },
-}));
+jest.mock('@osd/i18n', () => {
+  const getRegisteredLocales = jest.fn();
+  return {
+    i18n: {
+      getLocale: jest.fn(),
+      getTranslation: jest.fn(),
+      normalizeLocale: jest.fn((locale) => locale),
+      translate: jest.fn((key, { defaultMessage }) => defaultMessage),
+    },
+    i18nLoader: {
+      getRegisteredLocales: getRegisteredLocales,
+      getTranslationsByLocale: jest.fn(),
+      isRegisteredLocale: jest.fn((locale) => getRegisteredLocales()?.includes?.(locale)),
+    },
+  };
+});
 
 // Import mocked modules
 const { i18n, i18nLoader } = require('@osd/i18n');
diff --git a/src/plugins/dashboard/public/application/components/dashboard_top_nav/__snapshots__/dashboard_top_nav.test.tsx.snap b/src/plugins/dashboard/public/application/components/dashboard_top_nav/__snapshots__/dashboard_top_nav.test.tsx.snap
index df0e5af66a0b..6ad2d2ec040f 100644
--- a/src/plugins/dashboard/public/application/components/dashboard_top_nav/__snapshots__/dashboard_top_nav.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/components/dashboard_top_nav/__snapshots__/dashboard_top_nav.test.tsx.snap
@@ -144,6 +144,9 @@ exports[`Dashboard top nav render in embed mode 1`] = `
               "getHelpExtension$": [MockFunction],
               "getIsNavDrawerLocked$": [MockFunction],
               "getIsVisible$": [MockFunction],
+              "globalSearch": Object {
+                "getAllSearchCommands": [MockFunction],
+              },
               "logos": Object {
                 "AnimatedMark": Object {
                   "dark": Object {
@@ -1211,6 +1214,9 @@ exports[`Dashboard top nav render in embed mode, and force hide filter bar 1`] =
               "getHelpExtension$": [MockFunction],
               "getIsNavDrawerLocked$": [MockFunction],
               "getIsVisible$": [MockFunction],
+              "globalSearch": Object {
+                "getAllSearchCommands": [MockFunction],
+              },
               "logos": Object {
                 "AnimatedMark": Object {
                   "dark": Object {
@@ -2278,6 +2284,9 @@ exports[`Dashboard top nav render in embed mode, components can be forced show b
               "getHelpExtension$": [MockFunction],
               "getIsNavDrawerLocked$": [MockFunction],
               "getIsVisible$": [MockFunction],
+              "globalSearch": Object {
+                "getAllSearchCommands": [MockFunction],
+              },
               "logos": Object {
                 "AnimatedMark": Object {
                   "dark": Object {
@@ -3345,6 +3354,9 @@ exports[`Dashboard top nav render in full screen mode with appended URL param bu
               "getHelpExtension$": [MockFunction],
               "getIsNavDrawerLocked$": [MockFunction],
               "getIsVisible$": [MockFunction],
+              "globalSearch": Object {
+                "getAllSearchCommands": [MockFunction],
+              },
               "logos": Object {
                 "AnimatedMark": Object {
                   "dark": Object {
@@ -4412,6 +4424,9 @@ exports[`Dashboard top nav render in full screen mode, no componenets should be
               "getHelpExtension$": [MockFunction],
               "getIsNavDrawerLocked$": [MockFunction],
               "getIsVisible$": [MockFunction],
+              "globalSearch": Object {
+                "getAllSearchCommands": [MockFunction],
+              },
               "logos": Object {
                 "AnimatedMark": Object {
                   "dark": Object {
@@ -5479,6 +5494,9 @@ exports[`Dashboard top nav render with all components 1`] = `
               "getHelpExtension$": [MockFunction],
               "getIsNavDrawerLocked$": [MockFunction],
               "getIsVisible$": [MockFunction],
+              "globalSearch": Object {
+                "getAllSearchCommands": [MockFunction],
+              },
               "logos": Object {
                 "AnimatedMark": Object {
                   "dark": Object {
diff --git a/src/plugins/data/common/constants.ts b/src/plugins/data/common/constants.ts
index d612469cf035..65d144531fce 100644
--- a/src/plugins/data/common/constants.ts
+++ b/src/plugins/data/common/constants.ts
@@ -87,6 +87,7 @@ export const UI_SETTINGS = {
   SEARCH_INCLUDE_FROZEN: 'search:includeFrozen',
   SEARCH_TIMEOUT: 'search:timeout',
   SEARCH_INCLUDE_ALL_FIELDS: 'search:includeAllFields',
+  SEARCH_MAX_RECENT_DATASETS: 'search:maxRecentDatasets',
   HISTOGRAM_BAR_TARGET: 'histogram:barTarget',
   HISTOGRAM_MAX_BARS: 'histogram:maxBars',
   HISTORY_LIMIT: 'history:limit',
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 7bd0515914de..60a216504620 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -150,7 +150,7 @@ export class DataPublicPlugin
       storage: this.storage,
       sessionStorage: this.sessionStorage,
       defaultSearchInterceptor: searchService.getDefaultSearchInterceptor(),
-      applicaton: core.application,
+      application: core.application,
     });
 
     uiActions.registerAction(
@@ -225,7 +225,7 @@ export class DataPublicPlugin
       savedObjectsClient: savedObjects.client,
       uiSettings,
       indexPatterns,
-      applicaton: core.application,
+      application: core.application,
     });
     setQueryService(query);
 
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
index f13f8decc9a2..8d4feacc51ee 100644
--- a/src/plugins/data/public/query/query_service.ts
+++ b/src/plugins/data/public/query/query_service.ts
@@ -97,7 +97,7 @@ export class QueryService {
     storage,
     uiSettings,
     indexPatterns,
-    applicaton,
+    application,
   }: QueryServiceStartDependencies): IQueryStart {
     this.queryStringManager.getDatasetService().init(indexPatterns);
     return {
@@ -110,7 +110,7 @@ export class QueryService {
       savedQueries: createSavedQueryService(
         savedObjectsClient,
         this.queryStringManager,
-        applicaton
+        application
       ),
       state$: this.state$,
       timefilter: this.timefilter,
diff --git a/src/plugins/data/public/query/query_string/dataset_service/dataset_service.mock.ts b/src/plugins/data/public/query/query_string/dataset_service/dataset_service.mock.ts
index 0b9372b73092..df5521078feb 100644
--- a/src/plugins/data/public/query/query_string/dataset_service/dataset_service.mock.ts
+++ b/src/plugins/data/public/query/query_string/dataset_service/dataset_service.mock.ts
@@ -41,6 +41,8 @@ const createSetupDatasetServiceMock = (): jest.Mocked<DatasetServiceContract> =>
     getDefault: jest.fn().mockReturnValue(defaultDataset),
     cacheDataset: jest.fn(),
     fetchOptions: jest.fn(),
+    getRecentDatasets: jest.fn(),
+    addRecentDataset: jest.fn(),
   };
 };
 
diff --git a/src/plugins/data/public/query/query_string/dataset_service/dataset_service.test.ts b/src/plugins/data/public/query/query_string/dataset_service/dataset_service.test.ts
index d994d3a7699a..014a4acbc0b5 100644
--- a/src/plugins/data/public/query/query_string/dataset_service/dataset_service.test.ts
+++ b/src/plugins/data/public/query/query_string/dataset_service/dataset_service.test.ts
@@ -5,7 +5,7 @@
 
 import { DatasetService } from './dataset_service';
 import { coreMock } from '../../../../../../core/public/mocks';
-import { DEFAULT_DATA, DataStorage, Dataset } from 'src/plugins/data/common';
+import { DEFAULT_DATA, DataStorage, Dataset, UI_SETTINGS } from 'src/plugins/data/common';
 import { DataStructure } from '../../../../common';
 import { IDataPluginServices } from '../../../types';
 import { indexPatternTypeConfig } from './lib';
@@ -21,9 +21,13 @@ describe('DatasetService', () => {
 
   beforeEach(() => {
     uiSettings = coreMock.createSetup().uiSettings;
+    uiSettings.get = jest.fn().mockImplementation((setting: string) => {
+      if (setting === UI_SETTINGS.SEARCH_MAX_RECENT_DATASETS) {
+        return 4;
+      }
+    });
     sessionStorage = new DataStorage(window.sessionStorage, 'opensearchDashboards.');
     mockDataPluginServices = {} as jest.Mocked<IDataPluginServices>;
-
     service = new DatasetService(uiSettings, sessionStorage);
     indexPatterns = dataPluginMock.createStartContract().indexPatterns;
     service.init(indexPatterns);
@@ -129,4 +133,53 @@ describe('DatasetService', () => {
     expect(indexPatterns.create).toHaveBeenCalledTimes(0);
     expect(indexPatterns.saveToCache).toHaveBeenCalledTimes(0);
   });
+
+  test('addRecentDataset adds a dataset', () => {
+    const mockDataset1: Dataset = {
+      id: 'dataset1',
+      title: 'Dataset 1',
+      type: 'test-type',
+      timeFieldName: 'timestamp',
+    };
+
+    service.addRecentDataset(mockDataset1);
+    const recents = service.getRecentDatasets();
+    expect(recents).toContainEqual(mockDataset1);
+    expect(recents.length).toEqual(1);
+    expect(sessionStorage.get('recentDatasets')).toContainEqual(mockDataset1);
+  });
+
+  test('getRecentDatasets returns all datasets', () => {
+    for (let i = 0; i < 4; i++) {
+      service.addRecentDataset({
+        id: `dataset${i}`,
+        title: `Dataset ${i}`,
+        type: 'test-type',
+        timeFieldName: 'timestamp',
+      });
+    }
+    expect(service.getRecentDatasets().length).toEqual(4);
+    for (let i = 0; i < 4; i++) {
+      const mockDataset = {
+        id: `dataset${i}`,
+        title: `Dataset ${i}`,
+        type: 'test-type',
+        timeFieldName: 'timestamp',
+      };
+      expect(service.getRecentDatasets()).toContainEqual(mockDataset);
+      expect(sessionStorage.get('recentDatasets')).toContainEqual(mockDataset);
+    }
+  });
+
+  test('addRecentDatasets respects max size', () => {
+    for (let i = 0; i < 5; i++) {
+      service.addRecentDataset({
+        id: `dataset${i}`,
+        title: `Dataset ${i}`,
+        type: 'test-type',
+        timeFieldName: 'timestamp',
+      });
+    }
+    expect(service.getRecentDatasets().length).toEqual(4);
+  });
 });
diff --git a/src/plugins/data/public/query/query_string/dataset_service/dataset_service.ts b/src/plugins/data/public/query/query_string/dataset_service/dataset_service.ts
index 2ea646c56abc..41d1547e8eeb 100644
--- a/src/plugins/data/public/query/query_string/dataset_service/dataset_service.ts
+++ b/src/plugins/data/public/query/query_string/dataset_service/dataset_service.ts
@@ -4,6 +4,7 @@
  */
 
 import { CoreStart } from 'opensearch-dashboards/public';
+import LRUCache from 'lru-cache';
 import {
   Dataset,
   DataStructure,
@@ -22,6 +23,7 @@ export class DatasetService {
   private indexPatterns?: IndexPatternsContract;
   private defaultDataset?: Dataset;
   private typesRegistry: Map<string, DatasetTypeConfig> = new Map();
+  private recentDatasets: LRUCache<string, Dataset>;
 
   constructor(
     private readonly uiSettings: CoreStart['uiSettings'],
@@ -30,6 +32,10 @@ export class DatasetService {
     if (this.uiSettings.get(UI_SETTINGS.QUERY_ENHANCEMENTS_ENABLED)) {
       this.registerDefaultTypes();
     }
+    this.recentDatasets = new LRUCache({
+      max: this.uiSettings.get(UI_SETTINGS.SEARCH_MAX_RECENT_DATASETS),
+    });
+    this.deserializeRecentDatasets();
   }
 
   /**
@@ -61,6 +67,30 @@ export class DatasetService {
     return this.defaultDataset;
   }
 
+  private serializeRecentDatasets(): void {
+    this.sessionStorage.set('recentDatasets', this.getRecentDatasets());
+  }
+
+  private deserializeRecentDatasets(): void {
+    const cacheData = this.sessionStorage.get('recentDatasets');
+    if (cacheData) {
+      cacheData.forEach((dataset: Dataset) => this.addRecentDataset(dataset, false));
+    }
+  }
+
+  public getRecentDatasets(): Dataset[] {
+    return this.recentDatasets.values();
+  }
+
+  public addRecentDataset(dataset: Dataset | undefined, serialize: boolean = true): void {
+    if (dataset) {
+      this.recentDatasets.set(dataset.id, dataset);
+    }
+    if (serialize) {
+      this.serializeRecentDatasets();
+    }
+  }
+
   public async cacheDataset(dataset: Dataset): Promise<void> {
     const type = this.getType(dataset.type);
     if (dataset && dataset.type !== DEFAULT_DATA.SET_TYPES.INDEX_PATTERN) {
diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
index 2f804f711c1e..034a4f218fbd 100644
--- a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
+++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
@@ -92,6 +92,8 @@ setupMock.uiSettings.get.mockImplementation((key: string) => {
       return { pause: false, value: 0 };
     case UI_SETTINGS.QUERY_ENHANCEMENTS_ENABLED:
       return false;
+    case UI_SETTINGS.SEARCH_MAX_RECENT_DATASETS:
+      return 4;
     default:
       throw new Error(`sync_query test: not mocked uiSetting: ${key}`);
   }
@@ -121,13 +123,16 @@ describe('connect_storage_to_query_state', () => {
     queryService.setup({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
+      sessionStorage: new DataStorage(window.sessionStorage, 'opensearch_dashboards.'),
       defaultSearchInterceptor: mockSearchInterceptor,
+      application: setupMock.application,
     });
     queryServiceStart = queryService.start({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
       savedObjectsClient: startMock.savedObjects.client,
       indexPatterns: indexPatternsMock,
+      application: startMock.application,
     });
     indexPatternsMock = ({
       get: jest.fn(),
@@ -232,13 +237,16 @@ describe('connect_to_global_state', () => {
     queryService.setup({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
+      sessionStorage: new DataStorage(window.sessionStorage, 'opensearch_dashboards.'),
       defaultSearchInterceptor: mockSearchInterceptor,
+      application: setupMock.application,
     });
     queryServiceStart = queryService.start({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
       savedObjectsClient: startMock.savedObjects.client,
       indexPatterns: indexPatternsMock,
+      application: startMock.application,
     });
     filterManager = queryServiceStart.filterManager;
     timeFilter = queryServiceStart.timefilter.timefilter;
@@ -473,13 +481,16 @@ describe('connect_to_app_state', () => {
     queryService.setup({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
+      sessionStorage: new DataStorage(window.sessionStorage, 'opensearch_dashboards.'),
       defaultSearchInterceptor: mockSearchInterceptor,
+      application: setupMock.application,
     });
     queryServiceStart = queryService.start({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
       savedObjectsClient: startMock.savedObjects.client,
       indexPatterns: indexPatternsMock,
+      application: startMock.application,
     });
     filterManager = queryServiceStart.filterManager;
     indexPatternsMock = ({
@@ -659,13 +670,16 @@ describe('filters with different state', () => {
     queryService.setup({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
+      sessionStorage: new DataStorage(window.sessionStorage, 'opensearch_dashboards.'),
       defaultSearchInterceptor: mockSearchInterceptor,
+      application: setupMock.application,
     });
     queryServiceStart = queryService.start({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
       savedObjectsClient: startMock.savedObjects.client,
       indexPatterns: indexPatternsMock,
+      application: startMock.application,
     });
     filterManager = queryServiceStart.filterManager;
     indexPatternsMock = ({
diff --git a/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts b/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
index ca87637eb467..24abf6951cde 100644
--- a/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
+++ b/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
@@ -48,6 +48,7 @@ import { QueryService, QueryStart } from '../query_service';
 import { TimefilterContract } from '../timefilter';
 import { syncQueryStateWithUrl } from './sync_state_with_url';
 import { QueryState } from './types';
+import { ISearchInterceptor } from '../../search';
 
 const setupMock = coreMock.createSetup();
 const startMock = coreMock.createStart();
@@ -66,6 +67,8 @@ setupMock.uiSettings.get.mockImplementation((key: string) => {
       return { pause: false, value: 0 };
     case UI_SETTINGS.QUERY_ENHANCEMENTS_ENABLED:
       return false;
+    case UI_SETTINGS.SEARCH_MAX_RECENT_DATASETS:
+      return 4;
     default:
       throw new Error(`sync_query test: not mocked uiSetting: ${key}`);
   }
@@ -87,6 +90,7 @@ describe('sync_query_state_with_url', () => {
 
   let filterManagerChangeSub: Subscription;
   let filterManagerChangeTriggered = jest.fn();
+  let mockSearchInterceptor: jest.Mocked<ISearchInterceptor>;
 
   let gF: Filter;
   let aF: Filter;
@@ -99,12 +103,16 @@ describe('sync_query_state_with_url', () => {
     queryService.setup({
       uiSettings: setupMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
+      sessionStorage: new DataStorage(window.sessionStorage, 'opensearch_dashboards.'),
+      defaultSearchInterceptor: mockSearchInterceptor,
+      application: setupMock.application,
     });
     queryServiceStart = queryService.start({
       indexPatterns: indexPatternsMock,
       uiSettings: startMock.uiSettings,
       storage: new DataStorage(window.localStorage, 'opensearch_dashboards.'),
       savedObjectsClient: startMock.savedObjects.client,
+      application: startMock.application,
     });
     filterManager = queryServiceStart.filterManager;
     timefilter = queryServiceStart.timefilter.timefilter;
diff --git a/src/plugins/data/public/query/types.ts b/src/plugins/data/public/query/types.ts
index bacdc6b9b8e4..dc59787c1637 100644
--- a/src/plugins/data/public/query/types.ts
+++ b/src/plugins/data/public/query/types.ts
@@ -43,7 +43,7 @@ export interface QueryServiceSetupDependencies {
   storage: DataStorage;
   sessionStorage: DataStorage;
   defaultSearchInterceptor: ISearchInterceptor;
-  applicaton: ApplicationSetup;
+  application: ApplicationSetup;
 }
 
 /** @internal */
@@ -52,5 +52,5 @@ export interface QueryServiceStartDependencies {
   storage: DataStorage;
   uiSettings: IUiSettingsClient;
   indexPatterns: IndexPatternsService;
-  applicaton: ApplicationStart;
+  application: ApplicationStart;
 }
diff --git a/src/plugins/data/public/ui/dataset_selector/dataset_selector.test.tsx b/src/plugins/data/public/ui/dataset_selector/dataset_selector.test.tsx
index 1738cd4bc0d4..4621a4a4d3e7 100644
--- a/src/plugins/data/public/ui/dataset_selector/dataset_selector.test.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/dataset_selector.test.tsx
@@ -19,7 +19,7 @@ jest.mock('../../services', () => ({
 describe('DatasetSelector', () => {
   const nextTick = () => new Promise((res) => process.nextTick(res));
 
-  const fetchMock = jest.fn().mockResolvedValue({ children: [] });
+  const fetchMock = jest.fn().mockResolvedValue([]);
   const setDatasetsMock = jest.fn();
   const mockDatasetTypeConfig: DatasetTypeConfig = {
     id: 'mockType',
@@ -56,6 +56,8 @@ describe('DatasetSelector', () => {
       queryString: {
         getDatasetService: jest.fn().mockReturnValue({
           getType: getTypeMock,
+          getRecentDatasets: jest.fn().mockReturnValue([]),
+          addRecentDataset: jest.fn(),
         }),
       },
     });
diff --git a/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx b/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
index 1b46d5a9176c..76c9fbe74546 100644
--- a/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
@@ -15,6 +15,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { i18n } from '@osd/i18n';
 import { toMountPoint } from '../../../../opensearch_dashboards_react/public';
 import { Dataset, DEFAULT_DATA } from '../../../common';
 import { getQueryService } from '../../services';
@@ -44,7 +45,7 @@ export const DatasetSelector = ({
 }: DatasetSelectorProps) => {
   const isMounted = useRef(false);
   const [isOpen, setIsOpen] = useState(false);
-  const [datasets, setDatasets] = useState<Dataset[]>([]);
+  const [indexPatterns, setIndexPatterns] = useState<Dataset[]>([]);
   const { overlays } = services;
   const datasetService = getQueryService().queryString.getDatasetService();
   const datasetIcon =
@@ -64,7 +65,7 @@ export const DatasetSelector = ({
         fetchedIndexPatternDataStructures.children?.map((pattern) =>
           typeConfig.toDataset([pattern])
         ) ?? [];
-      setDatasets(fetchedDatasets);
+      setIndexPatterns(fetchedDatasets);
 
       // If no dataset is selected, select the first one
       if (!selectedDataset && fetchedDatasets.length > 0) {
@@ -81,6 +82,12 @@ export const DatasetSelector = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [datasetService]);
 
+  const recentDatasets = useMemo(() => {
+    return datasetService.getRecentDatasets();
+    // NOTE: Intentionally adding dependencies to ensure that we have the latest recentDatasets
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isOpen, datasetService]);
+
   const togglePopover = useCallback(async () => {
     setIsOpen(!isOpen);
   }, [isOpen]);
@@ -88,38 +95,62 @@ export const DatasetSelector = ({
   const closePopover = useCallback(() => setIsOpen(false), []);
 
   const options = useMemo(() => {
-    const newOptions: EuiSelectableOption[] = [
-      {
-        label: 'Index patterns',
-        isGroupLabel: true,
-      },
-    ];
-
-    datasets.forEach(({ id, title, type, dataSource }) => {
-      const label = dataSource ? `${dataSource.title}::${title}` : title;
-      newOptions.push({
-        label,
-        checked: id === selectedDataset?.id ? 'on' : undefined,
-        key: id,
-        prepend: <EuiIcon type={datasetService.getType(type)!.meta.icon.type} />,
+    const buildDatasetOptions = (
+      groupLabel: string,
+      ds: Dataset[],
+      selectedDatasetId: string | undefined
+    ): EuiSelectableOption[] => {
+      const datasetOptions: EuiSelectableOption[] = [
+        {
+          label: groupLabel,
+          isGroupLabel: true,
+        },
+      ];
+      ds.forEach(({ id, title, type, dataSource }) => {
+        const label = dataSource ? `${dataSource.title}::${title}` : title;
+        datasetOptions.push({
+          label,
+          checked: id === selectedDatasetId ? 'on' : undefined,
+          key: id,
+          prepend: <EuiIcon type={datasetService.getType(type)!.meta.icon.type} />,
+        });
       });
-    });
-
-    return newOptions;
-  }, [datasets, selectedDataset?.id, datasetService]);
+      return datasetOptions.length > 1 ? datasetOptions : [];
+    };
+    const recentDatasetOptions = buildDatasetOptions(
+      i18n.translate('data.dataSelector.recentDatasetsGroupLabel', {
+        defaultMessage: 'Recently selected data',
+      }),
+      recentDatasets,
+      selectedDataset?.id
+    );
+    const indexPatternOptions = buildDatasetOptions(
+      i18n.translate('data.dataSelector.indexPatternsGroupLabel', {
+        defaultMessage: 'Index patterns',
+      }),
+      indexPatterns.filter(
+        (dataset) => !recentDatasets.some((recentDataset) => recentDataset.id === dataset.id)
+      ),
+      selectedDataset?.id
+    );
+
+    return [...recentDatasetOptions, ...indexPatternOptions];
+  }, [indexPatterns, selectedDataset?.id, datasetService, recentDatasets]);
 
   const handleOptionChange = useCallback(
     (newOptions: EuiSelectableOption[]) => {
       const selectedOption = newOptions.find((option) => option.checked === 'on');
       if (selectedOption) {
-        const foundDataset = datasets.find((dataset) => dataset.id === selectedOption.key);
+        const foundDataset =
+          recentDatasets.find((dataset) => dataset.id === selectedOption.key) ||
+          indexPatterns.find((dataset) => dataset.id === selectedOption.key);
         if (foundDataset) {
           closePopover();
           setSelectedDataset(foundDataset);
         }
       }
     },
-    [datasets, setSelectedDataset, closePopover]
+    [recentDatasets, indexPatterns, setSelectedDataset, closePopover]
   );
 
   const datasetTitle = useMemo(() => {
diff --git a/src/plugins/data/public/ui/dataset_selector/index.test.tsx b/src/plugins/data/public/ui/dataset_selector/index.test.tsx
index 3bd94d043ec8..0dd456711c37 100644
--- a/src/plugins/data/public/ui/dataset_selector/index.test.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/index.test.tsx
@@ -24,6 +24,9 @@ describe('ConnectedDatasetSelector', () => {
     getDefaultQuery: jest.fn().mockReturnValue({}),
     getInitialQueryByDataset: jest.fn().mockReturnValue({}),
     setQuery: jest.fn(),
+    getDatasetService: jest.fn().mockReturnValue({
+      addRecentDataset: jest.fn(),
+    }),
   };
   const mockOnSubmit = jest.fn();
   const mockServices = {
diff --git a/src/plugins/data/public/ui/dataset_selector/index.tsx b/src/plugins/data/public/ui/dataset_selector/index.tsx
index fa6dea8f0035..d89f92bc3ad7 100644
--- a/src/plugins/data/public/ui/dataset_selector/index.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/index.tsx
@@ -28,6 +28,7 @@ const ConnectedDatasetSelector = ({ onSubmit }: ConnectedDatasetSelectorProps) =
         const query = queryString.getInitialQueryByDataset(dataset);
         queryString.setQuery(query);
         onSubmit!(queryString.getQuery());
+        queryString.getDatasetService().addRecentDataset(dataset);
       }
     },
     [onSubmit, queryString]
diff --git a/src/plugins/data/server/dql_telemetry/route.ts b/src/plugins/data/server/dql_telemetry/route.ts
index 2f2f3459658d..e18afcaf8b91 100644
--- a/src/plugins/data/server/dql_telemetry/route.ts
+++ b/src/plugins/data/server/dql_telemetry/route.ts
@@ -47,7 +47,6 @@ export function registerDqlTelemetryRoute(
     },
     async (context, request, response) => {
       const [{ savedObjects }] = await getStartServices();
-      const internalRepository = savedObjects.createScopedRepository(request);
 
       const {
         body: { opt_in: optIn },
@@ -56,11 +55,12 @@ export function registerDqlTelemetryRoute(
       const counterName = optIn ? 'optInCount' : 'optOutCount';
 
       try {
+        const internalRepository = savedObjects.createScopedRepository(request);
         await internalRepository.incrementCounter('dql-telemetry', 'dql-telemetry', counterName);
       } catch (error) {
         logger.warn(`Unable to increment counter: ${error}`);
         return response.customError({
-          statusCode: error.status,
+          statusCode: error.status || 403,
           body: {
             message: 'Something went wrong',
             attributes: {
diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts
index 153361959e63..e5da0986290d 100644
--- a/src/plugins/data/server/ui_settings.ts
+++ b/src/plugins/data/server/ui_settings.ts
@@ -782,5 +782,14 @@ export function getUiSettings(
       schema: schema.boolean(),
       category: ['search'],
     },
+    [UI_SETTINGS.SEARCH_MAX_RECENT_DATASETS]: {
+      name: i18n.translate('data.advancedSettings.searchMaxRecentDatasets', {
+        defaultMessage: 'Maximum datasets in recents list',
+      }),
+      value: 4,
+      type: 'number',
+      schema: schema.number(),
+      category: ['search'],
+    },
   };
 }
diff --git a/src/plugins/data_source_management/public/components/data_source_table/data_source_table.test.tsx b/src/plugins/data_source_management/public/components/data_source_table/data_source_table.test.tsx
index 6e0a1eef2059..87ed1e76d09e 100644
--- a/src/plugins/data_source_management/public/components/data_source_table/data_source_table.test.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_table/data_source_table.test.tsx
@@ -10,10 +10,12 @@ import { DataSourceTable } from './data_source_table';
 import { mount, ReactWrapper } from 'enzyme';
 import { RouteComponentProps } from 'react-router-dom';
 import { wrapWithIntl } from 'test_utils/enzyme_helpers';
-import { ScopedHistory } from 'opensearch-dashboards/public';
+import { ScopedHistory, WorkspaceObject } from 'opensearch-dashboards/public';
 import { scopedHistoryMock } from '../../../../../core/public/mocks';
 import { OpenSearchDashboardsContextProvider } from '../../../../opensearch_dashboards_react/public';
 import { getMappedDataSources, mockManagementPlugin } from '../../mocks';
+import { BehaviorSubject } from 'rxjs';
+import { DEFAULT_DATA_SOURCE_UI_SETTINGS_ID } from '../constants';
 
 const deleteButtonIdentifier = '[data-test-subj="deleteDataSourceConnections"]';
 const tableIdentifier = 'EuiInMemoryTable';
@@ -62,7 +64,7 @@ describe('DataSourceTable', () => {
   describe('should get datasources successful', () => {
     beforeEach(async () => {
       spyOn(utils, 'getDataSources').and.returnValue(Promise.resolve(getMappedDataSources));
-      spyOn(uiSettings, 'get').and.returnValue('test1');
+      spyOn(uiSettings, 'get$').and.returnValue(new BehaviorSubject('test1'));
       await act(async () => {
         component = await mount(
           wrapWithIntl(
@@ -204,4 +206,227 @@ describe('DataSourceTable', () => {
       expect(component.find(emptyStateIdentifier).exists()).toBe(true);
     });
   });
+
+  describe('data source table with actions', () => {
+    beforeEach(() => {
+      spyOn(utils, 'getDataSources').and.returnValue(Promise.resolve(getMappedDataSources));
+      spyOn(uiSettings, 'get$').and.returnValue(new BehaviorSubject('test1'));
+    });
+
+    test('should display set as default action', async () => {
+      const currentWorkspace$ = mockedContext.workspaces.currentWorkspace$;
+      // Mock that there is current workspace
+      mockedContext.workspaces.currentWorkspace$ = new BehaviorSubject<WorkspaceObject | null>({
+        id: 'workspace-id',
+        name: 'workspace name',
+      });
+
+      await act(async () => {
+        component = mount(
+          wrapWithIntl(
+            <DataSourceTable
+              history={history}
+              location={({} as unknown) as RouteComponentProps['location']}
+              match={({} as unknown) as RouteComponentProps['match']}
+            />
+          ),
+          {
+            wrappingComponent: OpenSearchDashboardsContextProvider,
+            wrappingComponentProps: {
+              services: mockedContext,
+            },
+          }
+        );
+      });
+      component.update();
+
+      // The set as default action button should be displayed when inside a workspace
+      expect(
+        component
+          .find('[data-test-subj="dataSourcesManagement-dataSourceTable-setAsDefaultButton"]')
+          .exists()
+      ).toBe(true);
+
+      // click setAsDefault button should set the data source as default
+      component
+        .find('[data-test-subj="dataSourcesManagement-dataSourceTable-setAsDefaultButton"]')
+        .first()
+        .simulate('click');
+      expect(uiSettings.set).toBeCalledWith(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, 'alpha-test');
+
+      // reset to original value
+      mockedContext.workspaces.currentWorkspace$ = currentWorkspace$;
+    });
+
+    test('should NOT display set as default action', async () => {
+      const currentWorkspace$ = mockedContext.workspaces.currentWorkspace$;
+      // Mock that there is NO current workspace
+      mockedContext.workspaces.currentWorkspace$ = new BehaviorSubject<WorkspaceObject | null>(
+        null
+      );
+
+      await act(async () => {
+        component = mount(
+          wrapWithIntl(
+            <DataSourceTable
+              history={history}
+              location={({} as unknown) as RouteComponentProps['location']}
+              match={({} as unknown) as RouteComponentProps['match']}
+            />
+          ),
+          {
+            wrappingComponent: OpenSearchDashboardsContextProvider,
+            wrappingComponentProps: {
+              services: mockedContext,
+            },
+          }
+        );
+      });
+      component.update();
+
+      // The set as default action button should NOT be displayed when outside of workspace
+      expect(
+        component
+          .find('[data-test-subj="dataSourcesManagement-dataSourceTable-setAsDefaultButton"]')
+          .exists()
+      ).toBe(false);
+
+      // reset to original value
+      mockedContext.workspaces.currentWorkspace$ = currentWorkspace$;
+    });
+
+    test('should display dissociate action', async () => {
+      const currentWorkspace$ = mockedContext.workspaces.currentWorkspace$;
+      const capabilities = mockedContext.application.capabilities;
+      // Mock that there is current workspace
+      mockedContext.workspaces.currentWorkspace$ = new BehaviorSubject<WorkspaceObject | null>({
+        id: 'workspace-id',
+        name: 'workspace name',
+      });
+      // Mock that the current user is dashboard admin
+      mockedContext.application.capabilities = {
+        ...capabilities,
+        dashboards: { isDashboardAdmin: true },
+      };
+
+      await act(async () => {
+        component = mount(
+          wrapWithIntl(
+            <DataSourceTable
+              history={history}
+              location={({} as unknown) as RouteComponentProps['location']}
+              match={({} as unknown) as RouteComponentProps['match']}
+            />
+          ),
+          {
+            wrappingComponent: OpenSearchDashboardsContextProvider,
+            wrappingComponentProps: {
+              services: mockedContext,
+            },
+          }
+        );
+      });
+      component.update();
+
+      // The dissociate data source action should be displayed
+      expect(
+        component
+          .find('[data-test-subj="dataSourcesManagement-dataSourceTable-dissociateButton"]')
+          .exists()
+      ).toBe(true);
+
+      // reset to original value
+      mockedContext.workspaces.currentWorkspace$ = currentWorkspace$;
+      mockedContext.application.capabilities = capabilities;
+    });
+
+    test('should NOT display dissociate action for non dashboard admin', async () => {
+      const currentWorkspace$ = mockedContext.workspaces.currentWorkspace$;
+      const capabilities = mockedContext.application.capabilities;
+      // Mock that there is current workspace
+      mockedContext.workspaces.currentWorkspace$ = new BehaviorSubject<WorkspaceObject | null>({
+        id: 'workspace-id',
+        name: 'workspace name',
+      });
+      // Mock that the current user is not dashboard admin
+      mockedContext.application.capabilities = {
+        ...capabilities,
+        dashboards: { isDashboardAdmin: false },
+      };
+
+      await act(async () => {
+        component = mount(
+          wrapWithIntl(
+            <DataSourceTable
+              history={history}
+              location={({} as unknown) as RouteComponentProps['location']}
+              match={({} as unknown) as RouteComponentProps['match']}
+            />
+          ),
+          {
+            wrappingComponent: OpenSearchDashboardsContextProvider,
+            wrappingComponentProps: {
+              services: mockedContext,
+            },
+          }
+        );
+      });
+      component.update();
+
+      // The dissociate data source action should not be displayed for non-admin user
+      expect(
+        component
+          .find('[data-test-subj="dataSourcesManagement-dataSourceTable-dissociateButton"]')
+          .exists()
+      ).toBe(false);
+
+      // reset to original value
+      mockedContext.workspaces.currentWorkspace$ = currentWorkspace$;
+      mockedContext.application.capabilities = capabilities;
+    });
+
+    test('should NOT display dissociate action if not in a workspace', async () => {
+      const currentWorkspace$ = mockedContext.workspaces.currentWorkspace$;
+      const capabilities = mockedContext.application.capabilities;
+      // Mock that there is no current workspace
+      mockedContext.workspaces.currentWorkspace$ = new BehaviorSubject<WorkspaceObject | null>(
+        null
+      );
+      // Mock that the current user is dashboard admin
+      mockedContext.application.capabilities = {
+        ...capabilities,
+        dashboards: { isDashboardAdmin: true },
+      };
+
+      await act(async () => {
+        component = mount(
+          wrapWithIntl(
+            <DataSourceTable
+              history={history}
+              location={({} as unknown) as RouteComponentProps['location']}
+              match={({} as unknown) as RouteComponentProps['match']}
+            />
+          ),
+          {
+            wrappingComponent: OpenSearchDashboardsContextProvider,
+            wrappingComponentProps: {
+              services: mockedContext,
+            },
+          }
+        );
+      });
+      component.update();
+
+      // The dissociate data source action should not be display when not inside a workspace
+      expect(
+        component
+          .find('[data-test-subj="dataSourcesManagement-dataSourceTable-dissociateButton"]')
+          .exists()
+      ).toBe(false);
+
+      // reset to original value
+      mockedContext.workspaces.currentWorkspace$ = currentWorkspace$;
+      mockedContext.application.capabilities = capabilities;
+    });
+  });
 });
diff --git a/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx b/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx
index 3ea2d61d1a79..d74b110ea07b 100644
--- a/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx
@@ -13,12 +13,16 @@ import {
   EuiSpacer,
   EuiText,
   EuiSearchBarProps,
+  EuiBasicTableColumn,
+  EuiButtonIcon,
 } from '@elastic/eui';
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useRef } from 'react';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { useEffectOnce } from 'react-use';
+import { useEffectOnce, useObservable } from 'react-use';
+import { of } from 'rxjs';
 import { i18n } from '@osd/i18n';
 import { FormattedMessage } from '@osd/i18n/react';
+import { TopNavControlComponentData } from 'src/plugins/navigation/public';
 import {
   reactRouterNavigate,
   useOpenSearchDashboards,
@@ -33,10 +37,10 @@ import {
   deleteMultipleDataSources,
   getDataSources,
   setFirstDataSourceAsDefault,
-  getDefaultDataSourceId,
   fetchDataSourceConnections,
 } from '../utils';
 import { LoadingMask } from '../loading_mask';
+import { DEFAULT_DATA_SOURCE_UI_SETTINGS_ID } from '../constants';
 
 /* Table config */
 const pagination = {
@@ -59,7 +63,18 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
     notifications,
     uiSettings,
     application,
+    navigation,
+    workspaces,
+    overlays,
   } = useOpenSearchDashboards<DataSourceManagementContext>().services;
+  const { HeaderControl } = navigation.ui;
+  const workspaceClient = useObservable(workspaces.client$);
+  const DataSourceAssociation = workspaceClient?.ui().DataSourceAssociation;
+  const defaultDataSourceIdRef = useRef(
+    uiSettings.get$<string | null>(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID)
+  );
+  const defaultDataSourceId = useObservable(defaultDataSourceIdRef.current);
+  const useUpdatedUX = uiSettings.get('home:useNewHomePage');
 
   /* Component state variables */
   const [dataSources, setDataSources] = useState<DataSourceTableItem[]>([]);
@@ -68,6 +83,9 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
   const [isDeleting, setIsDeleting] = React.useState<boolean>(false);
   const [confirmDeleteVisible, setConfirmDeleteVisible] = React.useState(false);
   const canManageDataSource = !!application.capabilities?.dataSource?.canManage;
+  const currentWorkspace = useObservable(workspaces ? workspaces.currentWorkspace$ : of(null));
+  const isDashboardAdmin = !!application?.capabilities?.dashboards?.isDashboardAdmin;
+  const canAssociateDataSource = !!currentWorkspace && isDashboardAdmin;
 
   /* useEffectOnce hook to avoid these methods called multiple times when state is updated. */
   useEffectOnce(() => {
@@ -82,9 +100,28 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
     fetchDataSources();
   });
 
-  const fetchDataSources = () => {
+  const associateDataSourceButton = DataSourceAssociation && [
+    {
+      renderComponent: (
+        <DataSourceAssociation
+          excludedDataSourceIds={dataSources.map((ds) => ds.id)}
+          onComplete={() => fetchDataSources()}
+        />
+      ),
+    } as TopNavControlComponentData,
+  ];
+
+  /* Toast Handlers */
+  const handleDisplayToastMessage = useCallback(
+    ({ message }: DataSourceManagementToastMessageItem) => {
+      notifications.toasts.addDanger(message);
+    },
+    [notifications.toasts]
+  );
+
+  const fetchDataSources = useCallback(() => {
     setIsLoading(true);
-    getDataSources(savedObjects.client)
+    return getDataSources(savedObjects.client)
       .then((response: DataSourceTableItem[]) => {
         return fetchDataSourceConnections(response, http, notifications, false);
       })
@@ -105,31 +142,87 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
       .finally(() => {
         setIsLoading(false);
       });
-  };
+  }, [handleDisplayToastMessage, http, notifications, savedObjects.client]);
+
+  const onDissociate = useCallback(
+    async (item: DataSourceTableItem | DataSourceTableItem[]) => {
+      const itemsToDissociate = Array<DataSourceTableItem>().concat(item);
+      const payload = itemsToDissociate.map((ds) => ({ id: ds.id, type: 'data-source' }));
+      const confirmed = await overlays.openConfirm('', {
+        title: i18n.translate('dataSourcesManagement.dataSourcesTable.removeAssociation', {
+          defaultMessage:
+            '{selectionSize, plural, one {Remove # association} other {Remove # associations}}',
+          values: { selectionSize: itemsToDissociate.length },
+        }),
+        buttonColor: 'danger',
+      });
+      if (confirmed) {
+        setIsLoading(true);
+        if (workspaceClient && currentWorkspace) {
+          await workspaceClient.dissociate(payload, currentWorkspace.id);
+          await fetchDataSources();
+          setSelectedDataSources([]);
+          if (payload.some((p) => p.id === defaultDataSourceId)) {
+            setFirstDataSourceAsDefault(savedObjects.client, uiSettings, true);
+          }
+        }
+      }
+    },
+    [
+      currentWorkspace,
+      defaultDataSourceId,
+      fetchDataSources,
+      overlays,
+      savedObjects.client,
+      uiSettings,
+      workspaceClient,
+    ]
+  );
 
   /* Table search config */
   const renderToolsLeft = useCallback(() => {
-    return selectedDataSources.length > 0
-      ? [
-          <EuiSmallButton
-            color="danger"
-            onClick={() => {
-              setConfirmDeleteVisible(true);
-            }}
-            data-test-subj="deleteDataSourceConnections"
-          >
-            <FormattedMessage
-              id="dataSourcesManagement.dataSourcesTable.deleteToolLabel"
-              defaultMessage="{selectionSize, plural, one {Delete # connection} other {Delete # connections}}"
-              values={{ selectionSize: selectedDataSources.length }}
-            />
-          </EuiSmallButton>,
-        ]
-      : [];
-  }, [selectedDataSources]);
+    if (selectedDataSources.length === 0) {
+      return [];
+    }
+    if (canManageDataSource) {
+      return [
+        <EuiSmallButton
+          color="danger"
+          onClick={() => {
+            setConfirmDeleteVisible(true);
+          }}
+          data-test-subj="deleteDataSourceConnections"
+        >
+          <FormattedMessage
+            id="dataSourcesManagement.dataSourcesTable.deleteToolLabel"
+            defaultMessage="{selectionSize, plural, one {Delete # connection} other {Delete # connections}}"
+            values={{ selectionSize: selectedDataSources.length }}
+          />
+        </EuiSmallButton>,
+      ];
+    }
+    if (canAssociateDataSource) {
+      return [
+        <EuiSmallButton
+          color="danger"
+          onClick={() => {
+            onDissociate(selectedDataSources);
+          }}
+          data-test-subj="dissociateSelectedDataSources"
+        >
+          <FormattedMessage
+            id="dataSourcesManagement.dataSourcesTable.dissociateSelectedDataSources"
+            defaultMessage="{selectionSize, plural, one {Remove # association} other {Remove # associations}}"
+            values={{ selectionSize: selectedDataSources.length }}
+          />
+        </EuiSmallButton>,
+      ];
+    }
+    return [];
+  }, [selectedDataSources, canManageDataSource, canAssociateDataSource, onDissociate]);
 
   const search: EuiSearchBarProps = {
-    toolsLeft: canManageDataSource ? renderToolsLeft() : undefined,
+    toolsLeft: renderToolsLeft(),
     compressed: true,
     box: {
       incremental: true,
@@ -157,7 +250,7 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
   };
 
   /* Table columns */
-  const columns = [
+  const columns: Array<EuiBasicTableColumn<DataSourceTableItem>> = [
     {
       field: 'title',
       name: i18n.translate('dataSourcesManagement.dataSourcesTable.dataSourceField', {
@@ -177,7 +270,7 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
           <EuiButtonEmpty size="xs" {...reactRouterNavigate(history, `${index.id}`)} flush="left">
             {name}
           </EuiButtonEmpty>
-          {index.id === getDefaultDataSourceId(uiSettings) ? (
+          {index.id === defaultDataSourceId ? (
             <EuiBadge iconType="starFilled" iconSide="left">
               Default
             </EuiBadge>
@@ -295,7 +388,7 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
   const setDefaultDataSource = async () => {
     try {
       for (const dataSource of selectedDataSources) {
-        if (getDefaultDataSourceId(uiSettings) === dataSource.id) {
+        if (defaultDataSourceId === dataSource.id) {
           await setFirstDataSourceAsDefault(savedObjects.client, uiSettings, true);
           break;
         }
@@ -324,12 +417,6 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
     onSelectionChange,
   };
 
-  /* Toast Handlers */
-
-  const handleDisplayToastMessage = ({ message }: DataSourceManagementToastMessageItem) => {
-    notifications.toasts.addDanger(message);
-  };
-
   /* Render Ui elements*/
   /* Render table */
   const renderTableContent = () => {
@@ -384,8 +471,67 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
     );
   };
 
+  const actionColumn: EuiBasicTableColumn<DataSourceTableItem> = {
+    name: 'Action',
+    actions: [],
+  };
+
+  // Add remove association action
+  if (canAssociateDataSource) {
+    actionColumn.actions.push({
+      name: i18n.translate('dataSourcesManagement.dataSourcesTable.removeAssociation.label', {
+        defaultMessage: 'Remove association',
+      }),
+      isPrimary: true,
+      description: i18n.translate(
+        'dataSourcesManagement.dataSourcesTable.removeAssociation.description',
+        {
+          defaultMessage: 'Remove association',
+        }
+      ),
+      icon: 'unlink',
+      type: 'icon',
+      onClick: async (item: DataSourceTableItem) => {
+        onDissociate(item);
+      },
+      'data-test-subj': 'dataSourcesManagement-dataSourceTable-dissociateButton',
+    });
+  }
+
+  // Add set as default action when data source list page opened within a workspace
+  if (currentWorkspace) {
+    actionColumn.actions.push({
+      render: (item) => {
+        return (
+          <EuiButtonIcon
+            data-test-subj="dataSourcesManagement-dataSourceTable-setAsDefaultButton"
+            isDisabled={defaultDataSourceId === item.id}
+            aria-label="Set as default data source"
+            title={i18n.translate('dataSourcesManagement.dataSourcesTable.setAsDefault.label', {
+              defaultMessage: 'Set as default',
+            })}
+            iconType="flag"
+            onClick={async () => {
+              await uiSettings.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, item.id);
+            }}
+          />
+        );
+      },
+    });
+  }
+
+  if (actionColumn.actions.length > 0) {
+    columns.push(actionColumn);
+  }
+
   return (
     <>
+      {useUpdatedUX && canAssociateDataSource && associateDataSourceButton && (
+        <HeaderControl
+          setMountPoint={application.setAppRightControls}
+          controls={associateDataSourceButton}
+        />
+      )}
       {tableRenderDeleteModal()}
       {!isLoading && (!dataSources || !dataSources.length)
         ? renderEmptyState()
diff --git a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.test.tsx b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.test.tsx
index 334fad5f810f..c4b82fc5156f 100644
--- a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.test.tsx
+++ b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.test.tsx
@@ -3,18 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { MemoryRouter, Route } from 'react-router-dom';
-import { DirectQueryDataConnectionDetail } from './direct_query_connection_detail';
+import { render, screen, waitFor } from '@testing-library/react';
 import {
   ApplicationStart,
   HttpStart,
   NotificationsStart,
   SavedObjectsStart,
 } from 'opensearch-dashboards/public';
+import React from 'react';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { coreMock } from '../../../../../../core/public/mocks';
+import { DataSourceSelectionService } from '../../../service/data_source_selection_service';
 import * as utils from '../../utils';
+import { DirectQueryDataConnectionDetail } from './direct_query_connection_detail';
 
 jest.mock('../../../constants', () => ({
   DATACONNECTIONS_BASE: '/api/dataconnections',
@@ -67,9 +69,17 @@ jest.mock('../associated_object_management/utils/associated_objects_tab_utils',
   redirectToExplorerS3: jest.fn(),
 }));
 
+const mockApplication = coreMock.createSetup().application;
+const mockUiSettings = coreMock.createSetup().uiSettings;
+const mockdataSourceSelection = new DataSourceSelectionService();
+
 jest.mock('../../utils', () => ({
   isPluginInstalled: jest.fn(),
   getDataSourcesWithFields: jest.fn(),
+  getApplication: () => mockApplication,
+  getUiSettings: () => mockUiSettings,
+  getHideLocalCluster: () => ({ enabled: true }),
+  getDataSourceSelection: () => mockdataSourceSelection,
 }));
 
 const renderComponent = ({
@@ -87,6 +97,7 @@ const renderComponent = ({
       find: jest.fn().mockResolvedValue({ saved_objects: [] }),
     },
   },
+  setHeaderActionMenu = jest.fn(),
 }) => {
   return render(
     <MemoryRouter initialEntries={['/dataconnections/test?dataSourceMDSId=test-mdsid']}>
@@ -98,6 +109,8 @@ const renderComponent = ({
           application={application as ApplicationStart}
           setBreadcrumbs={setBreadcrumbs}
           savedObjects={savedObjects as SavedObjectsStart}
+          useNewUX={false}
+          setHeaderActionMenu={setHeaderActionMenu}
         />
       </Route>
     </MemoryRouter>
diff --git a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx
index 9593f683ff92..8c8ea54a4854 100644
--- a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx
+++ b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx
@@ -3,55 +3,57 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useEffect, useState } from 'react';
 import {
+  EuiAccordion,
+  EuiCard,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
   EuiPage,
   EuiPageBody,
   EuiPageHeader,
   EuiPageHeaderSection,
-  EuiFlexGroup,
-  EuiFlexItem,
   EuiPanel,
   EuiSpacer,
-  EuiText,
   EuiTabbedContent,
-  EuiIcon,
-  EuiCard,
-  EuiAccordion,
+  EuiText,
 } from '@elastic/eui';
+import { escapeRegExp } from 'lodash';
 import {
   ApplicationStart,
   HttpStart,
+  MountPoint,
   NotificationsStart,
   SavedObjectsStart,
 } from 'opensearch-dashboards/public';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import { escapeRegExp } from 'lodash';
-import { DATACONNECTIONS_BASE } from '../../../constants';
-import { DirectQueryDatasourceDetails, PrometheusProperties } from '../../../types';
-import { NoAccess } from './utils/no_access_page';
-import { InactiveDataConnectionCallout } from './utils/inactive_data_connection_callout';
-import { AccessControlTab } from './access_control_tab';
-import { getManageDirectQueryDataSourceBreadcrumbs } from '../../breadcrumbs';
 import {
   useLoadAccelerationsToCache,
   useLoadDatabasesToCache,
   useLoadTablesToCache,
 } from '../../../../framework/catalog_cache/cache_loader';
-import { AccelerationTable } from '../acceleration_management/acceleration_table';
+import {
+  IntegrationInstanceResult,
+  IntegrationInstancesSearchResult,
+} from '../../../../framework/types';
+import { INTEGRATIONS_BASE } from '../../../../framework/utils/shared';
+import { DATACONNECTIONS_BASE } from '../../../constants';
 import { getRenderCreateAccelerationFlyout } from '../../../plugin';
+import { DirectQueryDatasourceDetails, PrometheusProperties } from '../../../types';
+import { getManageDirectQueryDataSourceBreadcrumbs } from '../../breadcrumbs';
+import { createDataSourceMenu, DataSourceViewConfig } from '../../data_source_menu';
+import { getDataSourcesWithFields, isPluginInstalled } from '../../utils';
+import { AccelerationTable } from '../acceleration_management/acceleration_table';
 import { AssociatedObjectsTab } from '../associated_object_management/associated_objects_tab';
 import { redirectToExplorerS3 } from '../associated_object_management/utils/associated_objects_tab_utils';
 import {
-  InstallIntegrationFlyout,
   InstalledIntegrationsTable,
+  InstallIntegrationFlyout,
 } from '../integrations/installed_integrations_table';
-import {
-  IntegrationInstanceResult,
-  IntegrationInstancesSearchResult,
-} from '../../../../framework/types';
-import { INTEGRATIONS_BASE } from '../../../../framework/utils/shared';
-import { isPluginInstalled, getDataSourcesWithFields } from '../../utils';
+import { AccessControlTab } from './access_control_tab';
+import { InactiveDataConnectionCallout } from './utils/inactive_data_connection_callout';
+import { NoAccess } from './utils/no_access_page';
 
 interface DirectQueryDataConnectionDetailProps {
   featureFlagStatus: boolean;
@@ -61,6 +63,7 @@ interface DirectQueryDataConnectionDetailProps {
   setBreadcrumbs: (breadcrumbs: any) => void;
   useNewUX: boolean;
   savedObjects: SavedObjectsStart;
+  setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
 }
 
 export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnectionDetailProps> = ({
@@ -71,12 +74,13 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
   setBreadcrumbs,
   useNewUX,
   savedObjects,
+  setHeaderActionMenu,
 }) => {
   const [observabilityDashboardsExists, setObservabilityDashboardsExists] = useState(false);
   const { dataSourceName } = useParams<{ dataSourceName: string }>();
   const { search } = useLocation();
   const queryParams = new URLSearchParams(search);
-  const dataSourceMDSId = queryParams.get('dataSourceMDSId');
+  const dataSourceMDSId = queryParams.get('dataSourceMDSId') ?? '';
   const [datasourceDetails, setDatasourceDetails] = useState<DirectQueryDatasourceDetails>({
     allowedRoles: [],
     name: '',
@@ -91,6 +95,24 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
     redirectToExplorerS3(dataSourceName, application);
   };
 
+  const dataSourceMenuView = useMemo(() => {
+    if (!featureFlagStatus) return null;
+
+    const DataSourceMenuView = createDataSourceMenu<DataSourceViewConfig>();
+
+    const dataSourceViewProps = {
+      setMenuMountPoint: setHeaderActionMenu,
+      componentConfig: {
+        activeOption: [{ id: dataSourceMDSId }],
+        savedObjects: savedObjects.client,
+        notifications,
+        fullWidth: true,
+      },
+    };
+
+    return <DataSourceMenuView {...dataSourceViewProps} componentType={'DataSourceView'} />;
+  }, [featureFlagStatus, dataSourceMDSId, setHeaderActionMenu, savedObjects.client, notifications]);
+
   // Cache loader hook
   const {
     loadStatus: databasesLoadStatus,
@@ -322,7 +344,7 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
             <EuiFlexItem grow={false}>
               <EuiText className="overview-title">Description</EuiText>
               <EuiText size="s" className="overview-content">
-                {datasourceDetails.description || '-'}
+                {datasourceDetails.description || '\u2014'}
               </EuiText>
             </EuiFlexItem>
           </EuiFlexGroup>
@@ -352,13 +374,13 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
             <EuiFlexItem grow={false}>
               <EuiText className="overview-title">Connection title</EuiText>
               <EuiText size="s" className="overview-content">
-                {datasourceDetails.name || '-'}
+                {datasourceDetails.name || '\u2014'}
               </EuiText>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
               <EuiText className="overview-title">Data source description</EuiText>
               <EuiText size="s" className="overview-content">
-                {datasourceDetails.description || '-'}
+                {datasourceDetails.description || '\u2014'}
               </EuiText>
             </EuiFlexItem>
           </EuiFlexGroup>
@@ -473,14 +495,15 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
       <EuiPageBody>
         <EuiPageHeader style={{ justifyContent: 'spaceBetween' }}>
           <EuiPageHeaderSection style={{ width: '100%', justifyContent: 'space-between' }}>
-            <EuiFlexGroup>
-              <EuiFlexItem grow={false}>
+            <EuiFlexGroup alignItems="center">
+              <EuiFlexItem>
                 {!useNewUX && (
                   <EuiText data-test-subj="datasourceTitle" size="s">
                     <h1>{datasourceDetails.name}</h1>
                   </EuiText>
                 )}
               </EuiFlexItem>
+              <EuiFlexItem grow={false}>{dataSourceMenuView}</EuiFlexItem>
             </EuiFlexGroup>
           </EuiPageHeaderSection>
         </EuiPageHeader>
diff --git a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.test.tsx b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.test.tsx
index cf104ef0c64b..df69c2f5d4ef 100644
--- a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.test.tsx
+++ b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.test.tsx
@@ -14,6 +14,7 @@ import { scopedHistoryMock } from '../../../../../../core/public/mocks';
 import { OpenSearchDashboardsContextProvider } from '../../../../../opensearch_dashboards_react/public';
 import { getMappedDataSources, mockManagementPlugin } from '../../../mocks';
 import { ManageDirectQueryDataConnectionsTable } from './manage_direct_query_data_connections_table';
+import { BehaviorSubject } from 'rxjs';
 
 const deleteButtonIdentifier = '[data-test-subj="deleteDataSourceConnections"]';
 const tableIdentifier = 'EuiInMemoryTable';
@@ -62,7 +63,7 @@ describe('ManageDirectQueryDataConnectionsTable', () => {
         Promise.resolve(getMappedDataSources)
       );
       spyOn(utils, 'getHideLocalCluster').and.returnValue(false);
-      spyOn(uiSettings, 'get').and.returnValue('test1');
+      spyOn(uiSettings, 'get$').and.returnValue(new BehaviorSubject('test1'));
       await act(async () => {
         component = await mount(
           wrapWithIntl(
diff --git a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx
index ac70945ec739..e34483eed75f 100644
--- a/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx
+++ b/src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx
@@ -13,17 +13,21 @@ import {
   EuiConfirmModal,
   EuiPageBody,
   EuiSpacer,
-  EuiTableFieldDataColumnType,
   EuiSearchBarProps,
   EuiLoadingSpinner,
   EuiText,
   LEFT_ALIGNMENT,
   EuiButtonEmpty,
+  EuiBasicTableColumn,
 } from '@elastic/eui';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { i18n } from '@osd/i18n';
 import { FormattedMessage } from 'react-intl';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
+import { useObservable } from 'react-use';
+import { of } from 'rxjs';
+import { TopNavControlComponentData } from 'src/plugins/navigation/public';
+
 import {
   DataSourceConnectionType,
   DataSourceManagementContext,
@@ -35,13 +39,13 @@ import {
   fetchDataSourceConnections,
   getDataSources,
   deleteMultipleDataSources,
-  getDefaultDataSourceId,
   setFirstDataSourceAsDefault,
   getHideLocalCluster,
 } from '../../utils';
 import { LoadingMask } from '../../loading_mask';
 import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public';
 import { DATACONNECTIONS_BASE, LOCAL_CLUSTER } from '../../../constants';
+import { DEFAULT_DATA_SOURCE_UI_SETTINGS_ID } from '../../constants';
 
 interface DirectQueryDataConnectionsProps extends RouteComponentProps {
   featureFlagStatus: boolean;
@@ -51,9 +55,30 @@ export const ManageDirectQueryDataConnectionsTable = ({
   featureFlagStatus,
   history,
 }: DirectQueryDataConnectionsProps) => {
-  const { savedObjects, http, notifications, uiSettings } = useOpenSearchDashboards<
-    DataSourceManagementContext
-  >().services;
+  const {
+    application,
+    savedObjects,
+    http,
+    notifications,
+    uiSettings,
+    navigation,
+    workspaces,
+    overlays,
+  } = useOpenSearchDashboards<DataSourceManagementContext>().services;
+  const { HeaderControl } = navigation.ui;
+  const workspaceClient = useObservable(workspaces.client$);
+  const currentWorkspace = useObservable(workspaces ? workspaces.currentWorkspace$ : of(null));
+  const DataSourceAssociation = workspaceClient?.ui().DataSourceAssociation;
+  const useUpdatedUX = uiSettings.get('home:useNewHomePage');
+  const defaultDataSourceIdRef = useRef(
+    uiSettings.get$<string | null>(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID)
+  );
+  const defaultDataSourceId = useObservable(defaultDataSourceIdRef.current);
+  const canManageDataSource = !!application.capabilities?.dataSource?.canManage;
+  const isDashboardAdmin = !!application?.capabilities?.dashboards?.isDashboardAdmin;
+  const canAssociateDataSource =
+    !!currentWorkspace && !currentWorkspace.readonly && isDashboardAdmin;
+
   const [observabilityDashboardsExists, setObservabilityDashboardsExists] = useState(false);
   const [showIntegrationsFlyout, setShowIntegrationsFlyout] = useState(false);
   const [integrationsFlyout, setIntegrationsFlyout] = useState<React.JSX.Element | null>(null);
@@ -83,7 +108,7 @@ export const ManageDirectQueryDataConnectionsTable = ({
   const setDefaultDataSource = async () => {
     try {
       for (const dataSource of selectedDataSources) {
-        if (getDefaultDataSourceId(uiSettings) === dataSource.id) {
+        if (defaultDataSourceId === dataSource.id) {
           await setFirstDataSourceAsDefault(savedObjects.client, uiSettings, true);
           break;
         }
@@ -100,6 +125,55 @@ export const ManageDirectQueryDataConnectionsTable = ({
     }
   };
 
+  const fetchDataSources = useCallback(() => {
+    setIsLoading(true);
+
+    const fetchConnections = featureFlagStatus
+      ? getDataSources(savedObjects.client)
+      : http.get(`${DATACONNECTIONS_BASE}`);
+
+    return fetchConnections
+      .then((response) => {
+        return featureFlagStatus
+          ? fetchDataSourceConnections(
+              response,
+              http,
+              notifications,
+              true,
+              getHideLocalCluster().enabled
+            )
+          : response.map((dataConnection: DirectQueryDatasourceDetails) => ({
+              id: dataConnection.name,
+              title: dataConnection.name,
+              type:
+                {
+                  S3GLUE: 'Amazon S3',
+                  PROMETHEUS: 'Prometheus',
+                }[dataConnection.connector] || dataConnection.connector,
+              connectionType: dataConnection.connector,
+              description: dataConnection.description,
+            }));
+      })
+      .then((finalData) => {
+        setData(
+          featureFlagStatus
+            ? finalData.filter((item) => item.relatedConnections?.length > 0)
+            : finalData
+        );
+      })
+      .catch(() => {
+        setData([]);
+        notifications.toasts.addDanger(
+          i18n.translate('dataSourcesManagement.directQueryTable.fetchDataSources', {
+            defaultMessage: 'Could not fetch data sources',
+          })
+        );
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  }, [http, savedObjects, notifications, featureFlagStatus]);
+
   /* Delete selected data sources*/
   const onClickDelete = () => {
     setIsDeleting(true);
@@ -127,6 +201,41 @@ export const ManageDirectQueryDataConnectionsTable = ({
       });
   };
 
+  const onDissociate = useCallback(
+    async (item: DataSourceTableItem | DataSourceTableItem[]) => {
+      const itemsToDissociate = Array<DataSourceTableItem>().concat(item);
+      const payload = itemsToDissociate.map((ds) => ({ id: ds.id, type: 'data-source' }));
+      const confirmed = await overlays.openConfirm('', {
+        title: i18n.translate('dataSourcesManagement.dataSourcesTable.removeAssociation', {
+          defaultMessage:
+            '{selectionSize, plural, one {Remove # association} other {Remove # associations}}',
+          values: { selectionSize: itemsToDissociate.length },
+        }),
+        buttonColor: 'danger',
+      });
+      if (confirmed) {
+        setIsLoading(true);
+        if (workspaceClient && currentWorkspace) {
+          await workspaceClient.dissociate(payload, currentWorkspace.id);
+          await fetchDataSources();
+          setSelectedDataSources([]);
+          if (payload.some((p) => p.id === defaultDataSourceId)) {
+            setFirstDataSourceAsDefault(savedObjects.client, uiSettings, true);
+          }
+        }
+      }
+    },
+    [
+      currentWorkspace,
+      defaultDataSourceId,
+      fetchDataSources,
+      overlays,
+      savedObjects.client,
+      uiSettings,
+      workspaceClient,
+    ]
+  );
+
   /* render delete modal*/
   const tableRenderDeleteModal = () => {
     return isModalVisible ? (
@@ -173,22 +282,43 @@ export const ManageDirectQueryDataConnectionsTable = ({
   };
 
   const renderToolsLeft = useCallback(() => {
-    return selectedDataSources.length > 0
-      ? [
-          <EuiSmallButton
-            color="danger"
-            onClick={() => setIsModalVisible(true)}
-            data-test-subj="deleteDataSourceConnections"
-          >
-            <FormattedMessage
-              id="dataSourcesManagement.directQueryTable.deleteToolLabel"
-              defaultMessage="{selectionSize, plural, one {Delete # connection} other {Delete # connections}}"
-              values={{ selectionSize: selectedDataSources.length }}
-            />
-          </EuiSmallButton>,
-        ]
-      : [];
-  }, [selectedDataSources]);
+    if (selectedDataSources.length === 0) {
+      return [];
+    }
+    if (canManageDataSource) {
+      return [
+        <EuiSmallButton
+          color="danger"
+          onClick={() => setIsModalVisible(true)}
+          data-test-subj="deleteDataSourceConnections"
+        >
+          <FormattedMessage
+            id="dataSourcesManagement.directQueryTable.deleteToolLabel"
+            defaultMessage="{selectionSize, plural, one {Delete # connection} other {Delete # connections}}"
+            values={{ selectionSize: selectedDataSources.length }}
+          />
+        </EuiSmallButton>,
+      ];
+    }
+    if (canAssociateDataSource) {
+      return [
+        <EuiSmallButton
+          color="danger"
+          onClick={() => {
+            onDissociate(selectedDataSources);
+          }}
+          data-test-subj="dissociateSelectedDataSources"
+        >
+          <FormattedMessage
+            id="dataSourcesManagement.dataSourcesTable.dissociateSelectedDataSources"
+            defaultMessage="{selectionSize, plural, one {Remove # association} other {Remove # associations}}"
+            values={{ selectionSize: selectedDataSources.length }}
+          />
+        </EuiSmallButton>,
+      ];
+    }
+    return [];
+  }, [selectedDataSources, canManageDataSource, canAssociateDataSource, onDissociate]);
 
   const toggleDetails = (item: DataSourceTableItem) => {
     const itemIdToExpandedRowMapValues = { ...itemIdToExpandedRowMap };
@@ -210,55 +340,6 @@ export const ManageDirectQueryDataConnectionsTable = ({
     setItemIdToExpandedRowMap(itemIdToExpandedRowMapValues);
   };
 
-  const fetchDataSources = useCallback(() => {
-    setIsLoading(true);
-
-    const fetchConnections = featureFlagStatus
-      ? getDataSources(savedObjects.client)
-      : http.get(`${DATACONNECTIONS_BASE}`);
-
-    fetchConnections
-      .then((response) => {
-        return featureFlagStatus
-          ? fetchDataSourceConnections(
-              response,
-              http,
-              notifications,
-              true,
-              getHideLocalCluster().enabled
-            )
-          : response.map((dataConnection: DirectQueryDatasourceDetails) => ({
-              id: dataConnection.name,
-              title: dataConnection.name,
-              type:
-                {
-                  S3GLUE: 'Amazon S3',
-                  PROMETHEUS: 'Prometheus',
-                }[dataConnection.connector] || dataConnection.connector,
-              connectionType: dataConnection.connector,
-              description: dataConnection.description,
-            }));
-      })
-      .then((finalData) => {
-        setData(
-          featureFlagStatus
-            ? finalData.filter((item) => item.relatedConnections?.length > 0)
-            : finalData
-        );
-      })
-      .catch(() => {
-        setData([]);
-        notifications.toasts.addDanger(
-          i18n.translate('dataSourcesManagement.directQueryTable.fetchDataSources', {
-            defaultMessage: 'Could not fetch data sources',
-          })
-        );
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
-  }, [http, savedObjects, notifications, featureFlagStatus]);
-
   useEffect(() => {
     fetchDataSources();
     isPluginInstalled('plugin:observabilityDashboards', notifications, http).then(
@@ -345,7 +426,7 @@ export const ManageDirectQueryDataConnectionsTable = ({
       truncateText: true,
       render: (relatedConnections: DataSourceTableItem[]) => relatedConnections?.length,
     },
-  ].filter(Boolean) as Array<EuiTableFieldDataColumnType<DataSourceTableItem>>;
+  ].filter(Boolean) as Array<EuiBasicTableColumn<DataSourceTableItem>>;
 
   const customSearchBar: EuiSearchBarProps = {
     toolsLeft: renderToolsLeft(),
@@ -370,8 +451,77 @@ export const ManageDirectQueryDataConnectionsTable = ({
     ],
   };
 
+  const associateDataSourceButton = DataSourceAssociation && [
+    {
+      renderComponent: (
+        <DataSourceAssociation
+          excludedDataSourceIds={data.map((ds) => ds.id)}
+          onComplete={() => fetchDataSources()}
+        />
+      ),
+    } as TopNavControlComponentData,
+  ];
+
+  const actionColumn: EuiBasicTableColumn<DataSourceTableItem> = {
+    name: 'Action',
+    actions: [],
+  };
+
+  // Add remove association action
+  if (canAssociateDataSource) {
+    actionColumn.actions.push({
+      name: i18n.translate('dataSourcesManagement.dataSourcesTable.removeAssociation.label', {
+        defaultMessage: 'Remove association',
+      }),
+      isPrimary: true,
+      description: i18n.translate(
+        'dataSourcesManagement.dataSourcesTable.removeAssociation.description',
+        {
+          defaultMessage: 'Remove association',
+        }
+      ),
+      icon: 'unlink',
+      type: 'icon',
+      onClick: async (item: DataSourceTableItem) => {
+        onDissociate(item);
+      },
+      'data-test-subj': 'dataSourcesManagement-dataSourceTable-dissociateButton',
+    });
+  }
+
+  // Add set as default action when data source list page opened within a workspace
+  if (currentWorkspace) {
+    actionColumn.actions.push({
+      render: (item) => {
+        return (
+          <EuiButtonIcon
+            isDisabled={defaultDataSourceId === item.id}
+            aria-label="Set as default data source"
+            title={i18n.translate('dataSourcesManagement.dataSourcesTable.setAsDefault.label', {
+              defaultMessage: 'Set as default',
+            })}
+            iconType="flag"
+            onClick={async () => {
+              await uiSettings.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, item.id);
+            }}
+          />
+        );
+      },
+    });
+  }
+
+  if (actionColumn.actions.length > 0) {
+    tableColumns.push(actionColumn);
+  }
+
   return (
     <EuiPageBody component="div">
+      {useUpdatedUX && canAssociateDataSource && associateDataSourceButton && (
+        <HeaderControl
+          setMountPoint={application.setAppRightControls}
+          controls={associateDataSourceButton}
+        />
+      )}
       <EuiFlexGroup justifyContent="center">
         {tableRenderDeleteModal()}
         <EuiFlexItem grow={false} style={{ width: '100%' }}>
diff --git a/src/plugins/data_source_management/public/management_app/mount_management_section.tsx b/src/plugins/data_source_management/public/management_app/mount_management_section.tsx
index 01727d5bf2dc..4423cf1f92f6 100644
--- a/src/plugins/data_source_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/data_source_management/public/management_app/mount_management_section.tsx
@@ -3,26 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { MountPoint, StartServicesAccessor } from 'src/core/public';
 
+import { EuiPageContent } from '@elastic/eui';
 import { I18nProvider } from '@osd/i18n/react';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { EuiPageContent } from '@elastic/eui';
 import { ManagementAppMountParams } from '../../../management/public';
 
 import { NavigationPublicPluginStart } from '../../../navigation/public';
 import { OpenSearchDashboardsContextProvider } from '../../../opensearch_dashboards_react/public';
+import { AuthenticationMethodRegistry } from '../auth_registry';
 import { CreateDataSourceWizardWithRouter } from '../components/create_data_source_wizard';
-import { EditDataSourceWithRouter } from '../components/edit_data_source';
-import { DataSourceHomePanel } from '../components/data_source_home_panel/data_source_home_panel';
 import { CreateDataSourcePanel } from '../components/data_source_creation_panel/create_data_source_panel';
-import { DataSourceManagementContext } from '../types';
-import { AuthenticationMethodRegistry } from '../auth_registry';
-import { ConfigureDirectQueryDataSourceWithRouter } from '../components/direct_query_data_sources_components/direct_query_data_source_configuration/configure_direct_query_data_sources';
+import { DataSourceHomePanel } from '../components/data_source_home_panel/data_source_home_panel';
 import { DirectQueryDataConnectionDetail } from '../components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail';
+import { ConfigureDirectQueryDataSourceWithRouter } from '../components/direct_query_data_sources_components/direct_query_data_source_configuration/configure_direct_query_data_sources';
+import { EditDataSourceWithRouter } from '../components/edit_data_source';
+import { DataSourceManagementContext } from '../types';
 
 export interface DataSourceManagementStartDependencies {
   data: DataPublicPluginStart;
@@ -31,7 +31,10 @@ export interface DataSourceManagementStartDependencies {
 
 export async function mountManagementSection(
   getStartServices: StartServicesAccessor<DataSourceManagementStartDependencies>,
-  params: ManagementAppMountParams & { wrapInPage?: boolean },
+  params: ManagementAppMountParams & {
+    wrapInPage?: boolean;
+    setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
+  },
   authMethodsRegistry: AuthenticationMethodRegistry,
   featureFlagStatus: boolean
 ) {
@@ -80,6 +83,7 @@ export async function mountManagementSection(
             application={application}
             useNewUX={useNewUX}
             savedObjects={savedObjects}
+            setHeaderActionMenu={params.setHeaderActionMenu}
           />
         </Route>
         {canManageDataSource && (
diff --git a/src/plugins/data_source_management/public/mocks.ts b/src/plugins/data_source_management/public/mocks.ts
index aa77ebece0a0..cd26df261ca8 100644
--- a/src/plugins/data_source_management/public/mocks.ts
+++ b/src/plugins/data_source_management/public/mocks.ts
@@ -30,6 +30,7 @@ import {
   SkippingIndexRowType,
 } from '../framework/types';
 import { AvailableIntegrationsTableProps } from './components/direct_query_data_sources_components/integrations/available_integration_table';
+import { navigationPluginMock } from '../../navigation/public/mocks';
 
 /* Mock Types */
 
@@ -54,6 +55,7 @@ const createDataSourceManagementContext = () => {
     uiSettings,
     notifications,
     overlays,
+    workspaces,
   } = coreMock.createStart();
   const { http } = coreMock.createSetup();
 
@@ -64,10 +66,12 @@ const createDataSourceManagementContext = () => {
     uiSettings,
     notifications,
     overlays,
+    workspaces,
     http,
     docLinks,
     setBreadcrumbs: () => {},
     authenticationMethodRegistry,
+    navigation: navigationPluginMock.createStartContract(),
   };
 };
 
diff --git a/src/plugins/dev_tools/opensearch_dashboards.json b/src/plugins/dev_tools/opensearch_dashboards.json
index 9b4a419c9ff4..de87e8d512cb 100644
--- a/src/plugins/dev_tools/opensearch_dashboards.json
+++ b/src/plugins/dev_tools/opensearch_dashboards.json
@@ -4,6 +4,6 @@
   "server": false,
   "ui": true,
   "optionalPlugins": ["dataSource", "managementOverview", "dataSourceManagement"],
-  "requiredPlugins": ["urlForwarding"],
+  "requiredPlugins": ["urlForwarding", "uiActions"],
   "requiredBundles": ["opensearchDashboardsReact"]
 }
diff --git a/src/plugins/dev_tools/public/application.tsx b/src/plugins/dev_tools/public/application.tsx
index e57f11bee617..1e7ba10a4728 100644
--- a/src/plugins/dev_tools/public/application.tsx
+++ b/src/plugins/dev_tools/public/application.tsx
@@ -243,6 +243,7 @@ export function MainApp(
   props: {
     devTools: readonly DevToolApp[];
     RouterComponent?: React.ComponentClass;
+    defaultRoute?: string;
   } & Pick<
     DevToolsWrapperProps,
     | 'savedObjects'
@@ -262,7 +263,9 @@ export function MainApp(
     useUpdatedUX,
     setMenuMountPoint,
     RouterComponent = Router,
+    defaultRoute,
   } = props;
+  const defaultTool = devTools.find((devTool) => devTool.id === defaultRoute) || devTools[0];
   return (
     <I18nProvider>
       <RouterComponent>
@@ -291,7 +294,7 @@ export function MainApp(
               />
             ))}
           <Route path="/">
-            <Redirect to={`/${devTools[0].id}`} />
+            <Redirect to={`/${defaultTool.id}`} />
           </Route>
         </Switch>
       </RouterComponent>
diff --git a/src/plugins/dev_tools/public/dev_tools_icon.test.tsx b/src/plugins/dev_tools/public/dev_tools_icon.test.tsx
index 1f0ca532f6cd..474fc1257936 100644
--- a/src/plugins/dev_tools/public/dev_tools_icon.test.tsx
+++ b/src/plugins/dev_tools/public/dev_tools_icon.test.tsx
@@ -8,10 +8,12 @@ import { fireEvent, render } from '@testing-library/react';
 import { DevToolsIcon } from './dev_tools_icon';
 import { coreMock } from '../../../core/public/mocks';
 import { urlForwardingPluginMock } from 'src/plugins/url_forwarding/public/mocks';
+import { uiActionsPluginMock } from 'src/plugins/ui_actions/public/mocks';
 
 const createDepsMock = () => {
   return {
     urlForwarding: urlForwardingPluginMock.createSetupContract(),
+    uiActions: uiActionsPluginMock.createSetupContract(),
   };
 };
 
@@ -55,4 +57,12 @@ describe('<DevToolsIcon />', () => {
     fireEvent.click(getByTestId('openDevToolsModal'));
     await findByText('Dev tools title');
   });
+
+  it('should register uiActions to show dev tools', async () => {
+    const coreStartMock = coreMock.createStart();
+    const deps = createDepsMock();
+    render(<DevToolsIcon core={coreStartMock} devTools={[]} deps={deps} title="Dev tools title" />);
+
+    expect(deps.uiActions.addTriggerAction).toHaveBeenCalled();
+  });
 });
diff --git a/src/plugins/dev_tools/public/dev_tools_icon.tsx b/src/plugins/dev_tools/public/dev_tools_icon.tsx
index fc30fb558f7c..5047864ec7bd 100644
--- a/src/plugins/dev_tools/public/dev_tools_icon.tsx
+++ b/src/plugins/dev_tools/public/dev_tools_icon.tsx
@@ -20,8 +20,9 @@ import { CoreStart } from 'opensearch-dashboards/public';
 import { MemoryRouter } from 'react-router-dom';
 import { MainApp } from './application';
 import { DevToolApp } from './dev_tool';
-import { DevToolsSetupDependencies } from './plugin';
+import { DEVTOOL_OPEN_ACTION, DevToolsSetupDependencies, devToolsTrigger } from './plugin';
 import './dev_tools_icon.scss';
+import { createAction } from '../../ui_actions/public';
 
 export function DevToolsIcon({
   core,
@@ -35,6 +36,20 @@ export function DevToolsIcon({
   title: string;
 }) {
   const [modalVisible, setModalVisible] = useState(false);
+
+  const [devToolTab, setDevToolTab] = useState('');
+
+  const createOpenDevToolAction = createAction<typeof DEVTOOL_OPEN_ACTION>({
+    type: DEVTOOL_OPEN_ACTION,
+    getDisplayName: () => 'Open DevTools',
+    execute: async ({ defaultRoute }) => {
+      setModalVisible(true);
+      setDevToolTab(defaultRoute);
+    },
+  });
+
+  deps.uiActions.addTriggerAction(devToolsTrigger.id, createOpenDevToolAction);
+
   const elementRef = useRef<HTMLDivElement | null>(null);
   const setMountPoint = useCallback((renderFn) => {
     renderFn(elementRef.current);
@@ -114,6 +129,7 @@ export function DevToolsIcon({
                     useUpdatedUX
                     setMenuMountPoint={setMountPoint}
                     RouterComponent={MemoryRouter}
+                    defaultRoute={devToolTab}
                   />
                   <EuiSpacer size="s" />
                   <EuiSmallButton
diff --git a/src/plugins/dev_tools/public/global_search/__snapshots__/search_devtool_command.test.tsx.snap b/src/plugins/dev_tools/public/global_search/__snapshots__/search_devtool_command.test.tsx.snap
new file mode 100644
index 000000000000..9c9cf8c830ca
--- /dev/null
+++ b/src/plugins/dev_tools/public/global_search/__snapshots__/search_devtool_command.test.tsx.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<DevToolItem /> render DevToolItem 1`] = `
+<div>
+  <div
+    aria-hidden="true"
+    data-test-subj="toolId-dev"
+  >
+    <nav
+      aria-label="breadcrumb"
+      class="euiSimplifiedBreadcrumbs euiSimplifiedBreadcrumbs--truncate"
+    >
+      <div
+        class="euiSimplifiedBreadcrumbWall euiSimplifiedBreadcrumbWall--single"
+      >
+        <span
+          aria-current="page"
+          class="euiSimplifiedBreadcrumb euiSimplifiedBreadcrumb--last"
+          title="Dev tools"
+        >
+          Dev tools
+        </span>
+      </div>
+    </nav>
+  </div>
+</div>
+`;
diff --git a/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx b/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx
new file mode 100644
index 000000000000..883584e49e08
--- /dev/null
+++ b/src/plugins/dev_tools/public/global_search/search_devtool_command.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { DevToolItem, searchForDevTools } from './search_devtool_command';
+import { fireEvent, render } from '@testing-library/react';
+import { uiActionsPluginMock } from 'src/plugins/ui_actions/public/mocks';
+import { DEVTOOL_TRIGGER_ID } from '../plugin';
+
+describe('DevtoolSearchCommand', () => {
+  const devToolsFn = jest.fn().mockReturnValue([
+    {
+      id: 'console',
+      title: 'Console',
+    },
+    {
+      id: 'others',
+      title: 'others dev tools',
+    },
+  ]);
+  const uiActionsApiFn = jest.fn();
+
+  it('searchForDevTools without any match', async () => {
+    const searchResult = await searchForDevTools('query', {
+      devTools: devToolsFn,
+      title: 'Dev tools',
+      uiActionsApi: uiActionsApiFn,
+    });
+
+    expect(searchResult).toHaveLength(0);
+  });
+
+  it('searchForDevTools with match tool', async () => {
+    const searchResult = await searchForDevTools('console', {
+      devTools: devToolsFn,
+      title: 'Dev tools',
+      uiActionsApi: uiActionsApiFn,
+    });
+
+    expect(searchResult).toHaveLength(1);
+    expect(searchResult[0]).toMatchInlineSnapshot(`
+      <DevToolItem
+        breadcrumbs={
+          Array [
+            Object {
+              "text": <EuiFlexGroup
+                alignItems="center"
+                gutterSize="s"
+              >
+                <EuiFlexItem>
+                  <EuiIcon
+                    color="text"
+                    type="consoleApp"
+                  />
+                </EuiFlexItem>
+                <EuiFlexItem>
+                  Dev tools
+                </EuiFlexItem>
+              </EuiFlexGroup>,
+            },
+            Object {
+              "onClick": [Function],
+              "text": <EuiHighlight
+                search="console"
+              >
+                Console
+              </EuiHighlight>,
+            },
+          ]
+        }
+        toolId="console"
+      />
+    `);
+  });
+});
+
+describe('<DevToolItem />', () => {
+  const uiActionsStartMock = uiActionsPluginMock.createStartContract();
+  uiActionsStartMock.getTrigger.mockReturnValue({
+    id: '',
+    exec: jest.fn(),
+  });
+  // test component DevToolItem
+  it('render DevToolItem', () => {
+    // render component with jest
+    const { container, getByTestId } = render(
+      <DevToolItem
+        breadcrumbs={[
+          {
+            text: 'Dev tools',
+          },
+        ]}
+        toolId="dev"
+        uiActionsApi={uiActionsStartMock}
+      />
+    );
+    expect(container).toMatchSnapshot();
+    fireEvent.click(getByTestId('toolId-dev'));
+    expect(uiActionsStartMock.getTrigger).toHaveBeenCalledWith(DEVTOOL_TRIGGER_ID);
+  });
+});
diff --git a/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx b/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx
new file mode 100644
index 000000000000..7bb8a9cb7238
--- /dev/null
+++ b/src/plugins/dev_tools/public/global_search/search_devtool_command.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ReactNode } from 'react';
+import {
+  EuiBreadcrumb,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHighlight,
+  EuiIcon,
+  EuiSimplifiedBreadcrumbs,
+} from '@elastic/eui';
+import React from 'react';
+import { DevToolApp } from '../dev_tool';
+import { UiActionsStart } from '../../../ui_actions/public';
+import { DEVTOOL_TRIGGER_ID } from '../plugin';
+
+export const searchForDevTools = async (
+  query: string,
+  props: {
+    devTools: () => readonly DevToolApp[];
+    title: string;
+    uiActionsApi: () => UiActionsStart;
+    callback?: () => void;
+  }
+): Promise<ReactNode[]> => {
+  const tools = props.devTools();
+
+  const devTool = (
+    <EuiFlexGroup gutterSize="s" alignItems="center">
+      <EuiFlexItem>
+        <EuiIcon type="consoleApp" color="text" />
+      </EuiFlexItem>
+      <EuiFlexItem>{props.title}</EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  return tools
+    .filter((tool) => tool.title.toLowerCase().includes(query.toLowerCase()))
+    .map((tool) => ({
+      breadcrumbs: [
+        {
+          text: devTool,
+        },
+        /**
+         * add onClick to make it looks like a link and don't changed to href,
+         * for dev tools, the url will not change, set href will have unexpected behavior
+         */
+        { text: <EuiHighlight search={query}>{tool.title}</EuiHighlight>, onClick: () => {} },
+      ],
+      toolId: tool.id,
+    }))
+    .map((item) => {
+      return (
+        <DevToolItem
+          uiActionsApi={props.uiActionsApi()}
+          callback={props.callback}
+          breadcrumbs={item.breadcrumbs}
+          toolId={item.toolId}
+        />
+      );
+    });
+};
+
+export const DevToolItem = ({
+  breadcrumbs,
+  toolId,
+  callback,
+  uiActionsApi,
+}: {
+  breadcrumbs: EuiBreadcrumb[];
+  toolId: string;
+  callback?: () => void;
+  uiActionsApi: UiActionsStart;
+}) => {
+  return (
+    <div
+      onClick={() => {
+        callback?.();
+        uiActionsApi.getTrigger(DEVTOOL_TRIGGER_ID).exec({ defaultRoute: toolId });
+      }}
+      aria-hidden={true}
+      data-test-subj={`toolId-${toolId}`}
+    >
+      <EuiSimplifiedBreadcrumbs breadcrumbs={breadcrumbs} hideTrailingSeparator />
+    </div>
+  );
+};
diff --git a/src/plugins/dev_tools/public/plugin.test.ts b/src/plugins/dev_tools/public/plugin.test.ts
new file mode 100644
index 000000000000..7cccaa2b58b5
--- /dev/null
+++ b/src/plugins/dev_tools/public/plugin.test.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CoreSetup } from 'opensearch-dashboards/public';
+import { DevToolsPlugin, DevToolsSetupDependencies } from './plugin';
+import { coreMock } from '../../../core/public/mocks';
+import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
+import { uiActionsPluginMock } from '../../ui_actions/public/mocks';
+
+describe('DevToolsPlugin', () => {
+  describe('setup', () => {
+    const plugin = new DevToolsPlugin();
+
+    const coreSetup: CoreSetup = coreMock.createSetup();
+    const deps: DevToolsSetupDependencies = {
+      urlForwarding: urlForwardingPluginMock.createSetupContract(),
+      uiActions: uiActionsPluginMock.createSetupContract(),
+    };
+
+    const getNavGroupEnabledMock = jest.fn().mockReturnValue(true);
+    const coreSetupMock = {
+      ...coreSetup,
+      chrome: {
+        ...coreSetup.chrome,
+        navGroup: {
+          ...coreSetup.chrome.navGroup,
+          getNavGroupEnabled: getNavGroupEnabledMock,
+        },
+      },
+    };
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should register global search strategy for dev tools when new home is enabled', () => {
+      plugin.setup(coreSetupMock, deps);
+      expect(coreSetupMock.chrome.globalSearch.registerSearchCommand).toHaveBeenCalled();
+      expect(deps.uiActions.registerTrigger).toHaveBeenCalled();
+    });
+
+    it('should not register global search strategy for dev tools when new home is not enabled', () => {
+      getNavGroupEnabledMock.mockReturnValue(false);
+      plugin.setup(coreSetupMock, deps);
+      expect(coreSetupMock.chrome.globalSearch.registerSearchCommand).not.toHaveBeenCalled();
+      expect(deps.uiActions.registerTrigger).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts
index e6478807da7a..d099d1fc90de 100644
--- a/src/plugins/dev_tools/public/plugin.ts
+++ b/src/plugins/dev_tools/public/plugin.ts
@@ -50,14 +50,40 @@ import { ManagementOverViewPluginSetup } from '../../management_overview/public'
 import { toMountPoint } from '../../opensearch_dashboards_react/public';
 import { DevToolsIcon } from './dev_tools_icon';
 import { WorkspaceAvailability } from '../../../core/public';
+import { searchForDevTools } from './global_search/search_devtool_command';
+import { Trigger, UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
+
+export const DEVTOOL_OPEN_ACTION = 'DEVTOOL_OPEN_ACTION';
+export const DEVTOOL_TRIGGER_ID = 'DEVTOOL_TRIGGER_ID';
+export const devToolsTrigger: Trigger = {
+  id: DEVTOOL_TRIGGER_ID,
+};
+
+export interface DevToolsContext {
+  defaultRoute: string;
+}
+
+declare module '../../ui_actions/public' {
+  export interface TriggerContextMapping {
+    [DEVTOOL_TRIGGER_ID]: {};
+  }
+
+  export interface ActionContextMapping {
+    [DEVTOOL_OPEN_ACTION]: DevToolsContext;
+  }
+}
 
 export interface DevToolsSetupDependencies {
   urlForwarding: UrlForwardingSetup;
+  uiActions: UiActionsSetup;
   dataSource?: DataSourcePluginSetup;
   dataSourceManagement?: DataSourceManagementPluginSetup;
   managementOverview?: ManagementOverViewPluginSetup;
 }
 
+export interface DevToolsStartDependencies {
+  uiActions: UiActionsStart;
+}
 export interface DevToolsSetup {
   /**
    * Register a developer tool. It will be available
@@ -76,11 +102,16 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup> {
   private readonly devTools = new Map<string, DevToolApp>();
   private appStateUpdater = new BehaviorSubject<AppUpdater>(() => ({}));
   private setupDeps: DevToolsSetupDependencies | undefined;
+  private uiActionsStart: UiActionsStart | undefined;
 
   private getSortedDevTools(): readonly DevToolApp[] {
     return sortBy([...this.devTools.values()], 'order');
   }
 
+  private getUiActionsStart(): UiActionsStart {
+    return this.uiActionsStart!;
+  }
+
   private title = i18n.translate('devTools.devToolsTitle', {
     defaultMessage: 'Dev Tools',
   });
@@ -89,7 +120,7 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup> {
 
   public setup(coreSetup: CoreSetup, deps: DevToolsSetupDependencies) {
     const { application: applicationSetup, getStartServices } = coreSetup;
-    const { urlForwarding, managementOverview } = deps;
+    const { urlForwarding, managementOverview, uiActions } = deps;
     this.setupDeps = deps;
 
     applicationSetup.register({
@@ -124,6 +155,25 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup> {
 
     urlForwarding.forwardApp('dev_tools', 'dev_tools');
 
+    if (coreSetup.chrome.navGroup.getNavGroupEnabled()) {
+      /**
+       * register search strategy for dev tools
+       */
+      coreSetup.chrome.globalSearch.registerSearchCommand({
+        id: 'devtools',
+        type: 'PAGES',
+        run: async (query: string, callback?: () => void) =>
+          searchForDevTools(query, {
+            devTools: this.getSortedDevTools.bind(this),
+            title: this.title,
+            uiActionsApi: this.getUiActionsStart.bind(this),
+            callback,
+          }),
+      });
+
+      uiActions.registerTrigger(devToolsTrigger);
+    }
+
     return {
       register: (devToolArgs: CreateDevToolArgs) => {
         if (this.devTools.has(devToolArgs.id)) {
@@ -139,7 +189,8 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup> {
     };
   }
 
-  public start(core: CoreStart) {
+  public start(core: CoreStart, { uiActions }: DevToolsStartDependencies) {
+    this.uiActionsStart = uiActions;
     if (core.chrome.navGroup.getNavGroupEnabled()) {
       core.chrome.navControls.registerLeftBottom({
         order: 4,
diff --git a/src/plugins/query_enhancements/common/query_assist/index.ts b/src/plugins/query_enhancements/common/query_assist/index.ts
index 7c577db88834..0541207e49f8 100644
--- a/src/plugins/query_enhancements/common/query_assist/index.ts
+++ b/src/plugins/query_enhancements/common/query_assist/index.ts
@@ -3,4 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { QueryAssistParameters, QueryAssistResponse, QueryAssistContextType } from './types';
+export {
+  QueryAssistParameters,
+  QueryAssistResponse,
+  QueryAssistContextType,
+  FeedbackStatus,
+} from './types';
diff --git a/src/plugins/query_enhancements/common/query_assist/types.ts b/src/plugins/query_enhancements/common/query_assist/types.ts
index d191befad5e7..a10da649d573 100644
--- a/src/plugins/query_enhancements/common/query_assist/types.ts
+++ b/src/plugins/query_enhancements/common/query_assist/types.ts
@@ -23,3 +23,9 @@ export enum QueryAssistContextType {
   QUERY,
   DATA,
 }
+
+export enum FeedbackStatus {
+  NONE = 'none',
+  THUMB_UP = 'thumbup',
+  THUMB_DOWN = 'thumbdown',
+}
diff --git a/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.test.tsx b/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.test.tsx
index 4ec5289a3fa0..09059494b48a 100644
--- a/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.test.tsx
+++ b/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.test.tsx
@@ -9,6 +9,7 @@ import { BehaviorSubject } from 'rxjs';
 import { QueryAssistSummary, convertResult } from './query_assist_summary';
 import { useQueryAssist } from '../hooks';
 import { IDataFrame, Query } from '../../../../data/common';
+import { FeedbackStatus as FEEDBACK } from '../../../common/query_assist';
 
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
@@ -89,10 +90,6 @@ describe('query assist summary', () => {
     YES: true,
     NO: false,
   };
-  const FEEDBACK = {
-    YES: true,
-    NO: false,
-  };
 
   const renderQueryAssistSummary = (isCollapsed: boolean) => {
     const component = render(
@@ -136,7 +133,7 @@ describe('query assist summary', () => {
   };
 
   const defaultUseStateMock = () => {
-    mockUseState(null, LOADING.NO, FEEDBACK.NO);
+    mockUseState(null, LOADING.NO, FEEDBACK.NONE);
   };
 
   it('should not show if collapsed is true', () => {
@@ -147,14 +144,14 @@ describe('query assist summary', () => {
   });
 
   it('should not show if assistant is disabled by capability', () => {
-    mockUseState(null, LOADING.NO, FEEDBACK.NO, false);
+    mockUseState(null, LOADING.NO, FEEDBACK.NONE, false);
     renderQueryAssistSummary(COLLAPSED.NO);
     const summaryPanels = screen.queryAllByTestId('queryAssist__summary');
     expect(summaryPanels).toHaveLength(0);
   });
 
   it('should not show if query assistant is collapsed', () => {
-    mockUseState(null, LOADING.NO, FEEDBACK.NO, true, COLLAPSED.YES);
+    mockUseState(null, LOADING.NO, FEEDBACK.NONE, true, COLLAPSED.YES);
     renderQueryAssistSummary(COLLAPSED.NO);
     const summaryPanels = screen.queryAllByTestId('queryAssist__summary');
     expect(summaryPanels).toHaveLength(0);
@@ -168,7 +165,7 @@ describe('query assist summary', () => {
   });
 
   it('should display loading view if loading state is true', () => {
-    mockUseState(null, LOADING.YES, FEEDBACK.NO);
+    mockUseState(null, LOADING.YES, FEEDBACK.NONE);
     renderQueryAssistSummary(COLLAPSED.NO);
     expect(screen.getByTestId('queryAssist_summary_loading')).toBeInTheDocument();
     expect(screen.queryAllByTestId('queryAssist_summary_result')).toHaveLength(0);
@@ -176,7 +173,7 @@ describe('query assist summary', () => {
   });
 
   it('should display loading view if loading state is true even with summary', () => {
-    mockUseState('summary', LOADING.YES, FEEDBACK.NO);
+    mockUseState('summary', LOADING.YES, FEEDBACK.NONE);
     renderQueryAssistSummary(COLLAPSED.NO);
     expect(screen.getByTestId('queryAssist_summary_loading')).toBeInTheDocument();
     expect(screen.queryAllByTestId('queryAssist_summary_result')).toHaveLength(0);
@@ -192,7 +189,7 @@ describe('query assist summary', () => {
   });
 
   it('should display summary result', () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     renderQueryAssistSummary(COLLAPSED.NO);
     expect(screen.getByTestId('queryAssist_summary_result')).toBeInTheDocument();
     expect(screen.getByTestId('queryAssist_summary_result')).toHaveTextContent('summary');
@@ -201,12 +198,12 @@ describe('query assist summary', () => {
   });
 
   it('should report metric for thumbup click', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     renderQueryAssistSummary(COLLAPSED.NO);
     expect(screen.getByTestId('queryAssist_summary_result')).toBeInTheDocument();
     await screen.getByTestId('queryAssist_summary_buttons_thumbup');
     fireEvent.click(screen.getByTestId('queryAssist_summary_buttons_thumbup'));
-    expect(setFeedback).toHaveBeenCalledWith(true);
+    expect(setFeedback).toHaveBeenCalledWith(FEEDBACK.THUMB_UP);
     expect(reportUiStatsMock).toHaveBeenCalledWith(
       'query-assist',
       'click',
@@ -215,12 +212,12 @@ describe('query assist summary', () => {
   });
 
   it('should report metric for thumbdown click', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     renderQueryAssistSummary(COLLAPSED.NO);
     expect(screen.getByTestId('queryAssist_summary_result')).toBeInTheDocument();
     await screen.getByTestId('queryAssist_summary_buttons_thumbdown');
     fireEvent.click(screen.getByTestId('queryAssist_summary_buttons_thumbdown'));
-    expect(setFeedback).toHaveBeenCalledWith(true);
+    expect(setFeedback).toHaveBeenCalledWith(FEEDBACK.THUMB_DOWN);
     expect(reportUiStatsMock).toHaveBeenCalledWith(
       'query-assist',
       'click',
@@ -228,8 +225,24 @@ describe('query assist summary', () => {
     );
   });
 
+  it('should hide thumbdown button if thumbup button is clicked', async () => {
+    mockUseState('summary', LOADING.NO, FEEDBACK.THUMB_UP);
+    renderQueryAssistSummary(COLLAPSED.NO);
+    expect(screen.getByTestId('queryAssist_summary_result')).toBeInTheDocument();
+    await screen.getByTestId('queryAssist_summary_buttons_thumbup');
+    expect(screen.queryByTestId('queryAssist_summary_buttons_thumbdown')).not.toBeInTheDocument();
+  });
+
+  it('should hide thumbup button if thumbdown button is clicked', async () => {
+    mockUseState('summary', LOADING.NO, FEEDBACK.THUMB_DOWN);
+    renderQueryAssistSummary(COLLAPSED.NO);
+    expect(screen.getByTestId('queryAssist_summary_result')).toBeInTheDocument();
+    await screen.getByTestId('queryAssist_summary_buttons_thumbdown');
+    expect(screen.queryByTestId('queryAssist_summary_buttons_thumbup')).not.toBeInTheDocument();
+  });
+
   it('should not fetch summary if data is empty', async () => {
-    mockUseState(null, LOADING.NO, FEEDBACK.NO);
+    mockUseState(null, LOADING.NO, FEEDBACK.NONE);
     renderQueryAssistSummary(COLLAPSED.NO);
     question$.next(question);
     query$.next({ query: PPL, language: 'PPL' });
@@ -238,7 +251,7 @@ describe('query assist summary', () => {
   });
 
   it('should fetch summary with expected payload and response', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     const RESPONSE_TEXT = 'response';
     httpMock.post.mockResolvedValue(RESPONSE_TEXT);
     renderQueryAssistSummary(COLLAPSED.NO);
@@ -258,27 +271,27 @@ describe('query assist summary', () => {
         dataSourceId: undefined,
       },
     });
-    expect(setSummary).toHaveBeenNthCalledWith(1, null);
+    expect(setSummary).toHaveBeenNthCalledWith(1, '');
     expect(setSummary).toHaveBeenNthCalledWith(2, RESPONSE_TEXT);
     expect(setLoading).toHaveBeenNthCalledWith(1, true);
     expect(setLoading).toHaveBeenNthCalledWith(2, false);
   });
 
   it('should handle fetch summary error', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     httpMock.post.mockRejectedValueOnce({});
     renderQueryAssistSummary(COLLAPSED.NO);
     question$.next(question);
     query$.next({ query: PPL, language: 'PPL' });
     data$.next(dataFrame as IDataFrame);
     await sleep(WAIT_TIME);
-    expect(setSummary).toBeCalledTimes(1);
+    expect(setSummary).toBeCalledTimes(2);
     expect(setLoading).toHaveBeenNthCalledWith(1, true);
     expect(setLoading).toHaveBeenNthCalledWith(2, false);
   });
 
   it('should not update queryResults if subscription changed not in order', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     const RESPONSE_TEXT = 'response';
     httpMock.post.mockResolvedValue(RESPONSE_TEXT);
     renderQueryAssistSummary(COLLAPSED.NO);
@@ -290,7 +303,7 @@ describe('query assist summary', () => {
   });
 
   it('should update queryResults if subscriptions changed in order', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.NO);
+    mockUseState('summary', LOADING.NO, FEEDBACK.NONE);
     const RESPONSE_TEXT = 'response';
     httpMock.post.mockResolvedValue(RESPONSE_TEXT);
     renderQueryAssistSummary(COLLAPSED.NO);
@@ -308,7 +321,7 @@ describe('query assist summary', () => {
   });
 
   it('should reset feedback state if re-fetch summary', async () => {
-    mockUseState('summary', LOADING.NO, FEEDBACK.YES);
+    mockUseState('summary', LOADING.NO, FEEDBACK.THUMB_UP);
     const RESPONSE_TEXT = 'response';
     httpMock.post.mockResolvedValue(RESPONSE_TEXT);
     renderQueryAssistSummary(COLLAPSED.NO);
@@ -316,6 +329,6 @@ describe('query assist summary', () => {
     query$.next({ query: PPL, language: 'PPL' });
     data$.next(dataFrame as IDataFrame);
     await sleep(WAIT_TIME);
-    expect(setFeedback).toHaveBeenCalledWith(FEEDBACK.NO);
+    expect(setFeedback).toHaveBeenCalledWith(FEEDBACK.NONE);
   });
 });
diff --git a/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.tsx b/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.tsx
index 4606a975713c..9a20c98fcbbd 100644
--- a/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.tsx
+++ b/src/plugins/query_enhancements/public/query_assist/components/query_assist_summary.tsx
@@ -29,6 +29,7 @@ import { CoreSetup } from '../../../../../core/public';
 import { QueryAssistContextType } from '../../../common/query_assist';
 import sparkleHollowSvg from '../../assets/sparkle_hollow.svg';
 import sparkleSolidSvg from '../../assets/sparkle_solid.svg';
+import { FeedbackStatus } from '../../../common/query_assist';
 
 export interface QueryContext {
   question: string;
@@ -65,9 +66,9 @@ export const convertResult = (body: IDataFrame) => {
 
 export const QueryAssistSummary: React.FC<QueryAssistSummaryProps> = (props) => {
   const { query, search } = props.data;
-  const [summary, setSummary] = useState(null); // store fetched data
+  const [summary, setSummary] = useState(''); // store fetched data
   const [loading, setLoading] = useState(false); // track loading state
-  const [feedback, setFeedback] = useState(false);
+  const [feedback, setFeedback] = useState(FeedbackStatus.NONE);
   const [isEnabledByCapability, setIsEnabledByCapability] = useState(false);
   const selectedDataset = useRef(query.queryString.getQuery()?.dataset);
   const { question$, isQueryAssistCollapsed } = useQueryAssist();
@@ -76,6 +77,9 @@ export const QueryAssistSummary: React.FC<QueryAssistSummaryProps> = (props) =>
     defaultMessage:
       'Thank you for the feedback. Try again by adjusting your question so that I have the opportunity to better assist you.',
   });
+  const errorPrompt = i18n.translate('queryEnhancements.queryAssist.summary.errorPrompt', {
+    defaultMessage: 'I am unable to respond to this query. Try another question.',
+  });
 
   const sampleSize = 10;
 
@@ -117,8 +121,8 @@ export const QueryAssistSummary: React.FC<QueryAssistSummaryProps> = (props) =>
     async (queryContext: QueryContext) => {
       if (isEmpty(queryContext?.queryResults)) return;
       setLoading(true);
-      setSummary(null);
-      setFeedback(false);
+      setSummary('');
+      setFeedback(FeedbackStatus.NONE);
       const SUCCESS_METRIC = 'fetch_summary_success';
       try {
         const actualSampleSize = Math.min(sampleSize, queryContext?.queryResults?.length);
@@ -140,11 +144,12 @@ export const QueryAssistSummary: React.FC<QueryAssistSummaryProps> = (props) =>
         reportCountMetric(SUCCESS_METRIC, 1);
       } catch (error) {
         reportCountMetric(SUCCESS_METRIC, 0);
+        setSummary(errorPrompt);
       } finally {
         setLoading(false);
       }
     },
-    [props.http, reportCountMetric]
+    [props.http, reportCountMetric, errorPrompt]
   );
 
   useEffect(() => {
@@ -203,9 +208,10 @@ export const QueryAssistSummary: React.FC<QueryAssistSummaryProps> = (props) =>
 
   const onFeedback = useCallback(
     (satisfied: boolean) => {
-      if (feedback) return;
-      setFeedback(true);
-      reportMetric(satisfied ? 'thumbup' : 'thumbdown');
+      if (feedback !== FeedbackStatus.NONE) return;
+      const feedbackStatus = satisfied ? FeedbackStatus.THUMB_UP : FeedbackStatus.THUMB_DOWN;
+      setFeedback(feedbackStatus);
+      reportMetric(feedbackStatus);
     },
     [feedback, reportMetric]
   );
@@ -247,38 +253,42 @@ export const QueryAssistSummary: React.FC<QueryAssistSummaryProps> = (props) =>
                     })}
                   />
                 </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiSmallButtonIcon
-                    aria-label="feedback thumbs up"
-                    color="text"
-                    iconType="thumbsUp"
-                    title={
-                      !feedback
-                        ? i18n.translate('queryEnhancements.queryAssist.summary.goodResponse', {
-                            defaultMessage: `Good response`,
-                          })
-                        : afterFeedbackTip
-                    }
-                    onClick={() => onFeedback(true)}
-                    data-test-subj="queryAssist_summary_buttons_thumbup"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiSmallButtonIcon
-                    aria-label="feedback thumbs down"
-                    color="text"
-                    title={
-                      !feedback
-                        ? i18n.translate('queryEnhancements.queryAssist.summary.badResponse', {
-                            defaultMessage: `Bad response`,
-                          })
-                        : afterFeedbackTip
-                    }
-                    iconType="thumbsDown"
-                    onClick={() => onFeedback(false)}
-                    data-test-subj="queryAssist_summary_buttons_thumbdown"
-                  />
-                </EuiFlexItem>
+                {feedback !== FeedbackStatus.THUMB_DOWN && (
+                  <EuiFlexItem grow={false}>
+                    <EuiSmallButtonIcon
+                      aria-label="feedback thumbs up"
+                      color={feedback === FeedbackStatus.THUMB_UP ? 'subdued' : 'text'}
+                      iconType="thumbsUp"
+                      title={
+                        !feedback
+                          ? i18n.translate('queryEnhancements.queryAssist.summary.goodResponse', {
+                              defaultMessage: `Good response`,
+                            })
+                          : afterFeedbackTip
+                      }
+                      onClick={() => onFeedback(true)}
+                      data-test-subj="queryAssist_summary_buttons_thumbup"
+                    />
+                  </EuiFlexItem>
+                )}
+                {feedback !== FeedbackStatus.THUMB_UP && (
+                  <EuiFlexItem grow={false}>
+                    <EuiSmallButtonIcon
+                      aria-label="feedback thumbs down"
+                      color={feedback === FeedbackStatus.THUMB_DOWN ? 'subdued' : 'text'}
+                      title={
+                        !feedback
+                          ? i18n.translate('queryEnhancements.queryAssist.summary.badResponse', {
+                              defaultMessage: `Bad response`,
+                            })
+                          : afterFeedbackTip
+                      }
+                      iconType="thumbsDown"
+                      onClick={() => onFeedback(false)}
+                      data-test-subj="queryAssist_summary_buttons_thumbdown"
+                    />
+                  </EuiFlexItem>
+                )}
                 <EuiSpacer size="m" style={{ borderLeft: '1px solid #D3DAE6', height: '20px' }} />
                 <EuiFlexItem grow={false}>
                   <EuiCopy textToCopy={summary ?? ''}>
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/duplicate_result_flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/duplicate_result_flyout.test.tsx.snap
index f8008f93250c..39270a4557ed 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/duplicate_result_flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/duplicate_result_flyout.test.tsx.snap
@@ -374,7 +374,7 @@ HTMLCollection [
                     class="euiFlexItem euiFlexItem--flexGrowZero"
                   >
                     <h4
-                      class="euiTitle euiTitle--xsmall savedObjectsManagementImportSummary__copiedCountCount"
+                      class="euiTitle euiTitle--xsmall savedObjectsManagementImportSummary__createdCount"
                     >
                       <span>
                         2 Successful
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
index 8a451f6802ed..55efd385954c 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
@@ -261,8 +261,8 @@ exports[`Header should render normally when useUpdatedUX is true 1`] = `
         Array [
           Object {
             "controlType": "button",
-            "disabled": false,
             "iconType": "copy",
+            "isDisabled": false,
             "label": "Copy all assets to...",
             "run": [Function],
             "testId": "duplicateObjects",
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_modal.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_modal.tsx
index e98aa35ebd21..2f5b9c2c9a1f 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_modal.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_modal.tsx
@@ -130,7 +130,7 @@ export class SavedObjectsDuplicateModal extends React.Component<ShowDuplicateMod
               id="savedObjectsManagement.objectsTable.duplicateModal.title"
               defaultMessage="Copy {objectCount, plural, =1 {{objectName}} other {# {useUpdatedUX, select, true {assets} other {objects}}}} to another workspace?"
               values={{
-                objectName: allSelectedObjects[0].meta.title,
+                objectName: allSelectedObjects[0]?.meta.title,
                 objectCount: allSelectedObjects.length,
                 useUpdatedUX: this.props.useUpdatedUX,
               }}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.test.tsx
index 7ab24e418500..154a4c24e3eb 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.test.tsx
@@ -7,6 +7,7 @@ import { SavedObjectsImportError, SavedObjectsImportSuccess } from 'opensearch-d
 import { DuplicateResultFlyout, DuplicateResultFlyoutProps } from './duplicate_result_flyout';
 import { fireEvent, render, screen } from '@testing-library/react';
 import React from 'react';
+import { IntlProvider } from 'react-intl';
 
 describe('DuplicateResultFlyout', () => {
   const failedCopies: SavedObjectsImportError[] = [
@@ -48,8 +49,16 @@ describe('DuplicateResultFlyout', () => {
     jest.clearAllMocks();
   });
 
+  const DuplicateResultFlyoutComponent = (props: DuplicateResultFlyoutProps) => {
+    return (
+      <IntlProvider locale="en">
+        <DuplicateResultFlyout {...props} />
+      </IntlProvider>
+    );
+  };
+
   it('renders the flyout with correct title and result', () => {
-    render(<DuplicateResultFlyout {...duplicateResultFlyoutProps} />);
+    render(<DuplicateResultFlyoutComponent {...duplicateResultFlyoutProps} />);
     expect(document.children).toMatchSnapshot();
 
     // Check title
@@ -76,7 +85,7 @@ describe('DuplicateResultFlyout', () => {
   });
 
   it('calls onClose when the close button is clicked', () => {
-    render(<DuplicateResultFlyout {...duplicateResultFlyoutProps} />);
+    render(<DuplicateResultFlyoutComponent {...duplicateResultFlyoutProps} />);
 
     const closeButton = screen.getByTestId('euiFlyoutCloseButton');
     fireEvent.click(closeButton);
@@ -86,7 +95,7 @@ describe('DuplicateResultFlyout', () => {
 
   it('copy count is null', () => {
     render(
-      <DuplicateResultFlyout
+      <DuplicateResultFlyoutComponent
         workspaceName={workspaceName}
         failedCopies={[]}
         successfulCopies={[]}
@@ -97,7 +106,7 @@ describe('DuplicateResultFlyout', () => {
   });
 
   it('calls onClose after footer close button clicked', () => {
-    render(<DuplicateResultFlyout {...duplicateResultFlyoutProps} />);
+    render(<DuplicateResultFlyoutComponent {...duplicateResultFlyoutProps} />);
 
     const closeButton = screen.getByText('Close');
     fireEvent.click(closeButton);
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.tsx
index 7b771d6723ee..2bca3d33ffe8 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/duplicate_result_flyout.tsx
@@ -91,7 +91,7 @@ export class DuplicateResultFlyout extends React.Component<DuplicateResultFlyout
         {copiedCount && (
           <EuiFlexItem grow={false}>
             <EuiTitle size="xs">
-              <h4 className="savedObjectsManagementImportSummary__copiedCountCount">
+              <h4 className="savedObjectsManagementImportSummary__createdCount">
                 <FormattedMessage
                   id="savedObjectsManagement.copyResult.copiedCountHeader"
                   defaultMessage="{copiedCount} Successful"
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx
index 7d201e16f224..0d447966be09 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx
@@ -127,7 +127,7 @@ export const Header = ({
                 testId: 'duplicateObjects',
                 run: onDuplicate,
                 controlType: 'button',
-                disabled: objectCount === 0,
+                isDisabled: objectCount === 0,
                 iconType: 'copy',
                 label: i18n.translate(
                   'savedObjectsManagement.objectsTable.header.duplicateAllAssetsButtonLabel',
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/_agg_row.scss b/src/plugins/vis_type_timeseries/public/application/components/aggs/_agg_row.scss
index f021d0f1905a..13c874435d36 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/_agg_row.scss
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/_agg_row.scss
@@ -17,7 +17,3 @@
 .tvbAggRow__unavailable {
   margin-top: -$euiSizeXS;
 }
-
-.tvbAgg__input {
-  @include euiFormControlStyle($borderOnly: false, $includeStates: true, $includeSizes: false);
-}
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
index 22254d3d4a08..cdc80d0650a9 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
@@ -45,6 +45,7 @@ import {
   EuiSpacer,
   EuiCompressedFormRow,
   EuiCompressedFieldNumber,
+  EuiFormControlLayout,
 } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import { MODEL_TYPES } from '../../../../common/model_options';
@@ -207,16 +208,18 @@ export const MovingAverageAgg = (props) => {
               })
             }
           >
-            {/*
-              EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-              Should it be text or number?
-            */}
-            <input
-              className="tvbAgg__input"
-              type="text"
-              onChange={handleNumberChange('window')}
-              value={model.window}
-            />
+            <EuiFormControlLayout compressed={true}>
+              {/*
+                EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                Should it be text or number?
+              */}
+              <input
+                className="euiFieldText euiFieldText--compressed"
+                type="text"
+                onChange={handleNumberChange('window')}
+                value={model.window}
+              />
+            </EuiFormControlLayout>
           </EuiCompressedFormRow>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
index b3fb682d7bb6..dfc8b9101605 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
@@ -43,6 +43,7 @@ import {
   EuiFormLabel,
   EuiCompressedFormRow,
   EuiSpacer,
+  EuiFormControlLayout,
 } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public';
@@ -117,16 +118,18 @@ export const SerialDiffAgg = (props) => {
               />
             }
           >
-            {/*
-              EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-              Should it be text or number?
-            */}
-            <input
-              className="tvbAgg__input"
-              onChange={handleNumberChange('lag')}
-              value={model.lag}
-              type="text"
-            />
+            <EuiFormControlLayout compressed={true}>
+              {/*
+                EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                Should it be text or number?
+              */}
+              <input
+                className="euiFieldText euiFieldText--compressed"
+                onChange={handleNumberChange('lag')}
+                value={model.lag}
+                type="text"
+              />
+            </EuiFormControlLayout>
           </EuiCompressedFormRow>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
index 7580c1c881bd..65ed49714a6e 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
@@ -44,6 +44,7 @@ import {
   EuiCompressedComboBox,
   EuiSpacer,
   EuiCompressedFormRow,
+  EuiFormControlLayout,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@osd/i18n/react';
 import { OSD_FIELD_TYPES } from '../../../../../../plugins/data/public';
@@ -206,15 +207,17 @@ const TopHitAggUi = (props) => {
               <FormattedMessage id="visTypeTimeseries.topHit.sizeLabel" defaultMessage="Size" />
             }
           >
-            {/*
-              EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-              Should it be text or number?
-            */}
-            <input
-              className="tvbAgg__input"
-              value={model.size}
-              onChange={handleTextChange('size')}
-            />
+            <EuiFormControlLayout compressed={true}>
+              {/*
+                EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                Should it be text or number?
+              */}
+              <input
+                className="euiFieldText euiFieldText--compressed"
+                value={model.size}
+                onChange={handleTextChange('size')}
+              />
+            </EuiFormControlLayout>
           </EuiCompressedFormRow>
         </EuiFlexItem>
         <EuiFlexItem>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js
index d623915074a9..1d2b32a035d4 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js
@@ -52,6 +52,7 @@ import {
   EuiCompressedFieldNumber,
   EuiTitle,
   EuiHorizontalRule,
+  EuiFormControlLayout,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@osd/i18n/react';
 import { QueryBarWrapper } from '../query_bar_wrapper';
@@ -215,17 +216,19 @@ class GaugePanelConfigUi extends Component {
                     />
                   }
                 >
-                  {/*
-                    EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-                    It accepts a null value, but is passed a empty string.
-                  */}
-                  <input
-                    id={htmlId('gaugeMax')}
-                    className="tvbAgg__input"
-                    type="number"
-                    onChange={handleTextChange('gauge_max')}
-                    value={model.gauge_max}
-                  />
+                  <EuiFormControlLayout compressed={true}>
+                    {/*
+                      EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                      It accepts a null value, but is passed a empty string.
+                    */}
+                    <input
+                      id={htmlId('gaugeMax')}
+                      className="euiFieldText euiFieldText--compressed"
+                      type="number"
+                      onChange={handleTextChange('gauge_max')}
+                      value={model.gauge_max}
+                    />
+                  </EuiFormControlLayout>
                 </EuiCompressedFormRow>
               </EuiFlexItem>
               <EuiFlexItem>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js
index e5ce1e9f9865..a7fef70aeaed 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js
@@ -52,6 +52,7 @@ import {
   EuiHorizontalRule,
   EuiCode,
   EuiText,
+  EuiFormControlLayout,
 } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 import { QueryBarWrapper } from '../query_bar_wrapper';
@@ -164,16 +165,18 @@ export class TablePanelConfig extends Component {
                       />
                     }
                   >
-                    {/*
-                      EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-                      Should it be number or string?
-                    */}
-                    <input
-                      className="tvbAgg__input"
-                      type="number"
-                      onChange={handleTextChange('pivot_rows')}
-                      value={model.pivot_rows}
-                    />
+                    <EuiFormControlLayout compressed={true}>
+                      {/*
+                        EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                        Should it be number or string?
+                      */}
+                      <input
+                        className="euiFieldText euiFieldText--compressed"
+                        type="number"
+                        onChange={handleTextChange('pivot_rows')}
+                        value={model.pivot_rows}
+                      />
+                    </EuiFormControlLayout>
                   </EuiCompressedFormRow>
                 </EuiFlexItem>
               </EuiFlexGroup>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js
index ac95f5450df1..09c094178502 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js
@@ -48,7 +48,7 @@ import {
   EuiCompressedFormRow,
   EuiFormLabel,
   EuiSpacer,
-  EuiCompressedFieldText,
+  EuiCompressedFieldNumber,
   EuiTitle,
   EuiHorizontalRule,
 } from '@elastic/eui';
@@ -271,7 +271,7 @@ class TimeseriesPanelConfigUi extends Component {
                     />
                   }
                 >
-                  <EuiCompressedFieldText
+                  <EuiCompressedFieldNumber
                     onChange={handleTextChange('axis_min')}
                     value={model.axis_min}
                   />
@@ -287,7 +287,7 @@ class TimeseriesPanelConfigUi extends Component {
                     />
                   }
                 >
-                  <EuiCompressedFieldText
+                  <EuiCompressedFieldNumber
                     onChange={handleTextChange('axis_max')}
                     value={model.axis_max}
                   />
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js
index d0a4af543610..41dd2fee0bc2 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js
@@ -47,13 +47,14 @@ import {
   EuiCompressedFieldNumber,
   EuiFormLabel,
   EuiSpacer,
+  EuiFormControlLayout,
 } from '@elastic/eui';
 import { FormattedMessage, injectI18n } from '@osd/i18n/react';
 import { getDefaultQueryLanguage } from '../../lib/get_default_query_language';
 import { QueryBarWrapper } from '../../query_bar_wrapper';
 
 import { isPercentDisabled } from '../../lib/stacked';
-import { STACKED_OPTIONS } from '../../../visualizations/constants/chart';
+import { STACKED_OPTIONS, AXIS_POSITION } from '../../../visualizations/constants/chart';
 
 export const TimeseriesConfig = injectI18n(function (props) {
   const handleSelectChange = createSelectHandler(props.onChange);
@@ -114,20 +115,48 @@ export const TimeseriesConfig = injectI18n(function (props) {
         id: 'visTypeTimeseries.timeSeries.rightLabel',
         defaultMessage: 'Right',
       }),
-      value: 'right',
+      value: AXIS_POSITION.RIGHT,
     },
     {
       label: intl.formatMessage({
         id: 'visTypeTimeseries.timeSeries.leftLabel',
         defaultMessage: 'Left',
       }),
-      value: 'left',
+      value: AXIS_POSITION.LEFT,
+    },
+    {
+      label: intl.formatMessage({
+        id: 'visTypeTimeseries.timeSeries.hiddenLabel',
+        defaultMessage: 'Hidden',
+      }),
+      value: AXIS_POSITION.HIDDEN,
     },
   ];
+
   const selectedAxisPosOption = positionOptions.find((option) => {
     return model.axis_position === option.value;
   });
 
+  const scaleOptions = [
+    {
+      label: intl.formatMessage({
+        id: 'visTypeTimeseries.timeseries.scaleOptions.normalLabel',
+        defaultMessage: 'Normal',
+      }),
+      value: 'normal',
+    },
+    {
+      label: intl.formatMessage({
+        id: 'visTypeTimeseries.timeseries.scaleOptions.logLabel',
+        defaultMessage: 'Log',
+      }),
+      value: 'log',
+    },
+  ];
+  const selectedAxisScaleOption = scaleOptions.find((option) => {
+    return model.axis_scale === option.value;
+  });
+
   const chartTypeOptions = [
     {
       label: intl.formatMessage({
@@ -505,17 +534,19 @@ export const TimeseriesConfig = injectI18n(function (props) {
               />
             }
           >
-            {/*
-              EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-              It accepts a null value, but is passed a empty string.
-            */}
-            <input
-              className="tvbAgg__input"
-              type="number"
-              disabled={disableSeparateYaxis}
-              onChange={handleTextChange('axis_min')}
-              value={model.axis_min}
-            />
+            <EuiFormControlLayout compressed={true}>
+              {/*
+                EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                It accepts a null value, but is passed a empty string.
+              */}
+              <input
+                className="euiFieldText euiFieldText--compressed"
+                type="number"
+                disabled={disableSeparateYaxis}
+                onChange={handleTextChange('axis_min')}
+                value={model.axis_min}
+              />
+            </EuiFormControlLayout>
           </EuiCompressedFormRow>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
@@ -528,16 +559,19 @@ export const TimeseriesConfig = injectI18n(function (props) {
               />
             }
           >
-            {/*
-              EUITODO: The following input couldn't be converted to EUI because of type mis-match.
-              It accepts a null value, but is passed a empty string.
-            */}
-            <input
-              className="tvbAgg__input"
-              disabled={disableSeparateYaxis}
-              onChange={handleTextChange('axis_max')}
-              value={model.axis_max}
-            />
+            <EuiFormControlLayout compressed={true}>
+              {/*
+                EUITODO: The following input couldn't be converted to EUI because of type mis-match.
+                It accepts a null value, but is passed a empty string.
+              */}
+              <input
+                className="euiFieldText euiFieldText--compressed"
+                type="number"
+                disabled={disableSeparateYaxis}
+                onChange={handleTextChange('axis_max')}
+                value={model.axis_max}
+              />
+            </EuiFormControlLayout>
           </EuiCompressedFormRow>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
@@ -560,6 +594,26 @@ export const TimeseriesConfig = injectI18n(function (props) {
             />
           </EuiCompressedFormRow>
         </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiCompressedFormRow
+            id={htmlId('axisScale')}
+            label={
+              <FormattedMessage
+                id="visTypeTimeseries.timeseries.optionsTab.axisScaleLabel"
+                defaultMessage="Axis scale"
+              />
+            }
+          >
+            <EuiCompressedComboBox
+              isClearable={false}
+              isDisabled={disableSeparateYaxis}
+              options={scaleOptions}
+              selectedOptions={selectedAxisScaleOption ? [selectedAxisScaleOption] : []}
+              onChange={handleSelectChange('axis_scale')}
+              singleSelection={{ asPlainText: true }}
+            />
+          </EuiCompressedFormRow>
+        </EuiFlexItem>
       </EuiFlexGroup>
 
       <EuiHorizontalRule margin="s" />
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
index db0dc4de77a6..cbf293cb1781 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
@@ -43,7 +43,7 @@ import { replaceVars } from '../../lib/replace_vars';
 import { getAxisLabelString } from '../../lib/get_axis_label_string';
 import { getInterval } from '../../lib/get_interval';
 import { createXaxisFormatter } from '../../lib/create_xaxis_formatter';
-import { STACKED_OPTIONS } from '../../../visualizations/constants';
+import { STACKED_OPTIONS, AXIS_POSITION } from '../../../visualizations/constants';
 import { getCoreStart } from '../../../../services';
 
 export class TimeseriesVisualization extends Component {
@@ -202,7 +202,11 @@ export class TimeseriesVisualization extends Component {
         seriesGroup.axisFormatter = 'percent';
         seriesGroup.axis_min = seriesGroup.axis_min || 0;
         seriesGroup.axis_max = seriesGroup.axis_max || 1;
-        seriesGroup.axis_position = model.axis_position;
+        // If the axis is hidden, arbitrarily set it to left
+        seriesGroup.axis_position =
+          seriesGroup.axis_position === AXIS_POSITION.HIDDEN
+            ? AXIS_POSITION.LEFT
+            : model.axis_position;
       }
 
       series
@@ -219,8 +223,11 @@ export class TimeseriesVisualization extends Component {
           domain,
           groupId,
           id: yAxisIdGenerator(seriesGroup.id),
-          position: seriesGroup.axis_position,
-          hide: isStackedWithinSeries,
+          position:
+            seriesGroup.axis_position === AXIS_POSITION.HIDDEN
+              ? AXIS_POSITION.LEFT
+              : seriesGroup.axis_position,
+          hide: isStackedWithinSeries || seriesGroup.axis_position === AXIS_POSITION.HIDDEN,
           tickFormatter:
             seriesGroup.stacked === STACKED_OPTIONS.PERCENT
               ? this.yAxisStackedByPercentFormatter
@@ -231,7 +238,11 @@ export class TimeseriesVisualization extends Component {
           tickFormatter: allSeriesHaveSameFormatters ? seriesGroupTickFormatter : (val) => val,
           id: yAxisIdGenerator('main'),
           groupId: mainAxisGroupId,
-          position: model.axis_position,
+          position:
+            seriesGroup.axis_position === AXIS_POSITION.HIDDEN
+              ? AXIS_POSITION.LEFT
+              : model.axis_position,
+          hide: seriesGroup.axis_position === AXIS_POSITION.HIDDEN,
           domain: mainAxisDomain,
         });
 
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/constants/chart.js b/src/plugins/vis_type_timeseries/public/application/visualizations/constants/chart.js
index a9a82d5c2bef..a21111cad21d 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/constants/chart.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/constants/chart.js
@@ -51,3 +51,9 @@ export const STACKED_OPTIONS = {
   STACKED: 'stacked',
   STACKED_WITHIN_SERIES: 'stacked_within_series',
 };
+
+export const AXIS_POSITION = {
+  LEFT: 'left',
+  RIGHT: 'right',
+  HIDDEN: 'hidden',
+};
diff --git a/src/plugins/vis_type_timeseries/public/metrics_type.ts b/src/plugins/vis_type_timeseries/public/metrics_type.ts
index ed3ea21c25e2..337689e2f57d 100644
--- a/src/plugins/vis_type_timeseries/public/metrics_type.ts
+++ b/src/plugins/vis_type_timeseries/public/metrics_type.ts
@@ -65,6 +65,7 @@ export const metricsVisDefinition = {
           ],
           separate_axis: 0,
           axis_position: 'right',
+          axis_scale: 'normal',
           formatter: 'number',
           chart_type: 'line',
           line_width: 1,
diff --git a/src/plugins/vis_type_timeseries/server/lib/timeseries_visualization_client_wrapper.ts b/src/plugins/vis_type_timeseries/server/lib/timeseries_visualization_client_wrapper.ts
index 91f8fd5b4134..03b79e327db7 100644
--- a/src/plugins/vis_type_timeseries/server/lib/timeseries_visualization_client_wrapper.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/timeseries_visualization_client_wrapper.ts
@@ -32,7 +32,12 @@ export const timeSeriesVisualizationClientWrapper: SavedObjectsClientWrapperFact
     }
 
     const tsvbAttributes = attributes as T & { visState: string };
-    const visState = JSON.parse(tsvbAttributes.visState);
+    let visState;
+    try {
+      visState = JSON.parse(tsvbAttributes.visState);
+    } catch (ex) {
+      throw SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
+    }
 
     if (visState.type !== 'metrics' || !visState.params) {
       return await wrapperOptions.client.create(type, attributes, options);
diff --git a/src/plugins/workspace/common/constants.ts b/src/plugins/workspace/common/constants.ts
index 0d660944d02e..837e0e11f417 100644
--- a/src/plugins/workspace/common/constants.ts
+++ b/src/plugins/workspace/common/constants.ts
@@ -44,6 +44,12 @@ export const PRIORITY_FOR_WORKSPACE_UI_SETTINGS_WRAPPER = -2;
 export const PRIORITY_FOR_WORKSPACE_CONFLICT_CONTROL_WRAPPER = -1;
 export const PRIORITY_FOR_PERMISSION_CONTROL_WRAPPER = 0;
 
+/**
+ * The repository wrapper should be the wrapper closest to the repository client,
+ * so we give a large number to the wrapper
+ */
+export const PRIORITY_FOR_REPOSITORY_WRAPPER = Number.MAX_VALUE;
+
 /**
  *
  * This is a temp solution to store relationships between use cases  and features.
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.test.tsx b/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.test.tsx
index 17d0818f37b1..fdc56756dcf2 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.test.tsx
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.test.tsx
@@ -6,13 +6,14 @@
 import React from 'react';
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { AddCollaboratorsModal } from './add_collaborators_modal';
+import { DuplicateCollaboratorError } from './duplicate_collaborator_error';
 
 describe('AddCollaboratorsModal', () => {
   const defaultProps = {
     title: 'Add Collaborators',
     inputLabel: 'Collaborator ID',
     addAnotherButtonLabel: 'Add Another',
-    permissionType: 'readOnly',
+    permissionType: 'user' as const,
     onClose: jest.fn(),
     onAddCollaborators: jest.fn(),
   };
@@ -46,7 +47,7 @@ describe('AddCollaboratorsModal', () => {
     fireEvent.click(addCollaboratorsButton);
     await waitFor(() => {
       expect(defaultProps.onAddCollaborators).toHaveBeenCalledWith([
-        { collaboratorId: 'user1', accessLevel: 'readOnly', permissionType: 'readOnly' },
+        { collaboratorId: 'user1', accessLevel: 'readOnly', permissionType: 'user' },
       ]);
     });
   });
@@ -68,10 +69,60 @@ describe('AddCollaboratorsModal', () => {
     const instruction = {
       title: 'Instructions',
       detail: 'Follow these instructions to add collaborators',
+      link: 'foo',
     };
     const props = { ...defaultProps, instruction };
     render(<AddCollaboratorsModal {...props} />);
     expect(screen.getByText(instruction.title)).toBeInTheDocument();
     expect(screen.getByText(instruction.detail)).toBeInTheDocument();
+    expect(screen.getByText('Learn more in Documentation')).toBeInTheDocument();
+  });
+
+  it('should display consistent duplicate collaborators errors', async () => {
+    const mockOnAddCollaborators = () => {
+      throw new DuplicateCollaboratorError({ pendingAdded: ['user1'], existing: ['user2'] });
+    };
+    render(<AddCollaboratorsModal {...defaultProps} onAddCollaborators={mockOnAddCollaborators} />);
+    const collaboratorIdInput0 = screen.getByTestId('workspaceCollaboratorIdInput-0');
+    fireEvent.change(collaboratorIdInput0, { target: { value: 'user1' } });
+
+    fireEvent.click(screen.getByText('Add Another'));
+    const collaboratorIdInput1 = screen.getByTestId('workspaceCollaboratorIdInput-1');
+    fireEvent.change(collaboratorIdInput1, { target: { value: 'user1' } });
+
+    fireEvent.click(screen.getByText('Add Another'));
+    const collaboratorIdInput2 = screen.getByTestId('workspaceCollaboratorIdInput-2');
+    fireEvent.change(collaboratorIdInput2, { target: { value: 'user2' } });
+
+    const addCollaboratorsButton = screen.getByRole('button', { name: 'Add collaborators' });
+    fireEvent.click(addCollaboratorsButton);
+    await waitFor(() => {
+      expect(screen.getByText('This ID is already added to the list.')).toBeInTheDocument();
+      expect(screen.getByText('A collaborator with this ID already exists.')).toBeInTheDocument();
+    });
+  });
+
+  it('should disable "Add collaborators" button during onAddCollaborators execution', async () => {
+    const onAddCollaboratorsMock = jest.fn().mockReturnValue(
+      new Promise((resolve) => {
+        window.setTimeout(resolve, 1000);
+      })
+    );
+    render(<AddCollaboratorsModal {...defaultProps} onAddCollaborators={onAddCollaboratorsMock} />);
+    const collaboratorInput = screen.getByLabelText(defaultProps.inputLabel);
+    fireEvent.change(collaboratorInput, { target: { value: 'user1' } });
+    const addCollaboratorsButton = screen.getByRole('button', { name: 'Add collaborators' });
+
+    jest.useFakeTimers();
+    fireEvent.click(addCollaboratorsButton);
+    await waitFor(() => {
+      expect(addCollaboratorsButton).toBeDisabled();
+    });
+    jest.runAllTimers();
+    jest.useRealTimers();
+
+    await waitFor(() => {
+      expect(addCollaboratorsButton).not.toBeDisabled();
+    });
   });
 });
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.tsx b/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.tsx
index 6c69d17886a4..07d2d8a90054 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.tsx
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/add_collaborators_modal.tsx
@@ -6,6 +6,7 @@
 import {
   EuiAccordion,
   EuiHorizontalRule,
+  EuiLink,
   EuiModal,
   EuiModalBody,
   EuiModalFooter,
@@ -24,6 +25,21 @@ import {
   WorkspaceCollaboratorsPanel,
   WorkspaceCollaboratorInner,
 } from './workspace_collaborators_panel';
+import { DuplicateCollaboratorError } from './duplicate_collaborator_error';
+
+const DUPLICATE_COLLABORATOR_ERROR_MESSAGE = i18n.translate(
+  'workspace.addCollaboratorsModal.errors.duplicateCollaborator',
+  {
+    defaultMessage: 'A collaborator with this ID already exists.',
+  }
+);
+
+const DUPLICATE_COLLABORATOR_WITH_LIST_ERROR_MESSAGE = i18n.translate(
+  'workspace.addCollaboratorsModal.errors.duplicateCollaboratorWithList',
+  {
+    defaultMessage: 'This ID is already added to the list.',
+  }
+);
 
 export interface AddCollaboratorsModalProps {
   title: string;
@@ -34,7 +50,7 @@ export interface AddCollaboratorsModalProps {
   inputPlaceholder?: string;
   instruction?: {
     title: string;
-    detail: string;
+    detail: React.ReactNode;
     link?: string;
   };
   permissionType: WorkspaceCollaboratorPermissionType;
@@ -57,15 +73,60 @@ export const AddCollaboratorsModal = ({
   const [collaborators, setCollaborators] = useState<WorkspaceCollaboratorInner[]>([
     { id: 0, accessLevel: 'readOnly', collaboratorId: '' },
   ]);
-  const validCollaborators = collaborators.flatMap(({ collaboratorId, accessLevel }) => {
-    if (!collaboratorId) {
+  const [errors, setErrors] = useState<{ [key: number]: string }>({});
+
+  const validInnerCollaborators = collaborators.flatMap((collaborator) => {
+    if (!collaborator.collaboratorId) {
       return [];
     }
-    return { collaboratorId, accessLevel, permissionType };
+    return collaborator;
   });
+  const [isAdding, setIsAdding] = useState(false);
 
-  const handleAddCollaborators = () => {
-    onAddCollaborators(validCollaborators);
+  const handleAddCollaborators = async () => {
+    const collaboratorId2IdsMap = validInnerCollaborators.reduce<{
+      [key: string]: number[];
+    }>((previousValue, collaborator) => {
+      const key = collaborator.collaboratorId;
+      const existingIds = previousValue[key];
+
+      if (!existingIds) {
+        return {
+          ...previousValue,
+          [key]: [collaborator.id],
+        };
+      }
+      existingIds.push(collaborator.id);
+      return previousValue;
+    }, {});
+    setErrors({});
+    setIsAdding(true);
+    try {
+      await onAddCollaborators(
+        validInnerCollaborators.map(({ id, ...collaborator }) => ({
+          ...collaborator,
+          permissionType,
+        }))
+      );
+    } catch (error) {
+      if (error instanceof DuplicateCollaboratorError) {
+        const newErrors: { [key: number]: string } = {};
+        error.details.pendingAdded.forEach((collaboratorId) => {
+          collaboratorId2IdsMap[collaboratorId].slice(1).forEach((id) => {
+            newErrors[id] = DUPLICATE_COLLABORATOR_ERROR_MESSAGE;
+          });
+        });
+        error.details.existing.forEach((collaboratorId) => {
+          collaboratorId2IdsMap[collaboratorId].forEach((id) => {
+            newErrors[id] = DUPLICATE_COLLABORATOR_WITH_LIST_ERROR_MESSAGE;
+          });
+        });
+        setErrors(newErrors);
+        return;
+      }
+    } finally {
+      setIsAdding(false);
+    }
   };
 
   return (
@@ -91,6 +152,19 @@ export const AddCollaboratorsModal = ({
               <EuiSpacer size="xs" />
               <EuiSpacer size="s" />
               <EuiText size="xs">{instruction.detail}</EuiText>
+              {instruction.link && (
+                <>
+                  <EuiSpacer size="xs" />
+                  <EuiLink href={instruction.link} target="_blank" external>
+                    {i18n.translate(
+                      'workspace.addCollaboratorsModal.instruction.learnMoreLinkText',
+                      {
+                        defaultMessage: 'Learn more in Documentation',
+                      }
+                    )}
+                  </EuiLink>
+                </>
+              )}
             </EuiAccordion>
             <EuiHorizontalRule margin="xs" />
             <EuiSpacer size="s" />
@@ -103,6 +177,7 @@ export const AddCollaboratorsModal = ({
           description={inputDescription}
           collaboratorIdInputPlaceholder={inputPlaceholder}
           addAnotherButtonLabel={addAnotherButtonLabel}
+          errors={errors}
         />
       </EuiModalBody>
 
@@ -113,10 +188,12 @@ export const AddCollaboratorsModal = ({
           })}
         </EuiSmallButtonEmpty>
         <EuiSmallButton
-          disabled={validCollaborators.length === 0}
+          disabled={validInnerCollaborators.length === 0}
           type="submit"
           onClick={handleAddCollaborators}
           fill
+          isDisabled={isAdding}
+          isLoading={isAdding}
         >
           {i18n.translate('workspace.addCollaboratorsModal.addCollaboratorsButton', {
             defaultMessage: 'Add collaborators',
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/duplicate_collaborator_error.ts b/src/plugins/workspace/public/components/add_collaborators_modal/duplicate_collaborator_error.ts
new file mode 100644
index 000000000000..540450e77b84
--- /dev/null
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/duplicate_collaborator_error.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export class DuplicateCollaboratorError {
+  constructor(
+    private _details: {
+      pendingAdded: string[];
+      existing: string[];
+    }
+  ) {}
+  public get details() {
+    return this._details;
+  }
+}
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/index.ts b/src/plugins/workspace/public/components/add_collaborators_modal/index.ts
index e0d031c693ef..c252c95f4af4 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/index.ts
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/index.ts
@@ -4,3 +4,7 @@
  */
 
 export { AddCollaboratorsModal, AddCollaboratorsModalProps } from './add_collaborators_modal';
+export {
+  DuplicateCollaboratorError,
+  CollaboratorDuplicateSource,
+} from './duplicate_collaborator_error';
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.test.tsx b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.test.tsx
index e20d28b8d5d1..933221ab13ef 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.test.tsx
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.test.tsx
@@ -41,4 +41,9 @@ describe('WorkspaceCollaboratorInput', () => {
     fireEvent.click(deleteButton);
     expect(defaultProps.onDelete).toHaveBeenCalledWith(0);
   });
+
+  it('collaborator id input should be invalid when error passed', () => {
+    render(<WorkspaceCollaboratorInput {...defaultProps} error="error" />);
+    expect(screen.getByTestId('workspaceCollaboratorIdInput-0')).toBeInvalid();
+  });
 });
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.tsx b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.tsx
index 93a53c3fbcc8..3d849992f169 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.tsx
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborator_input.tsx
@@ -20,6 +20,7 @@ export const COLLABORATOR_ID_INPUT_LABEL_ID = 'collaborator_id_input_label';
 
 export interface WorkspaceCollaboratorInputProps {
   index: number;
+  error?: string;
   collaboratorId?: string;
   accessLevel: WorkspaceCollaboratorAccessLevel;
   collaboratorIdInputPlaceholder?: string;
@@ -42,6 +43,7 @@ const isAccessLevelKey = (test: string): test is WorkspaceCollaboratorAccessLeve
 
 export const WorkspaceCollaboratorInput = ({
   index,
+  error,
   accessLevel,
   collaboratorId,
   onDelete,
@@ -79,6 +81,7 @@ export const WorkspaceCollaboratorInput = ({
           data-test-subj={`workspaceCollaboratorIdInput-${index}`}
           placeholder={collaboratorIdInputPlaceholder}
           aria-labelledby={COLLABORATOR_ID_INPUT_LABEL_ID}
+          isInvalid={!!error}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.test.tsx b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.test.tsx
index f5e695cc59a7..45d50710c8e1 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.test.tsx
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.test.tsx
@@ -91,4 +91,12 @@ describe('WorkspaceCollaboratorsPanel', () => {
       { id: 3, collaboratorId: '', accessLevel: 'readOnly' },
     ]);
   });
+
+  it('should display error message if provided', () => {
+    render(
+      <WorkspaceCollaboratorsPanel {...defaultProps} errors={{ 2: 'A test error message' }} />
+    );
+
+    expect(screen.getByText('A test error message')).toBeInTheDocument();
+  });
 });
diff --git a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.tsx b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.tsx
index 4c71d1c6be0e..80ca9666ab16 100644
--- a/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.tsx
+++ b/src/plugins/workspace/public/components/add_collaborators_modal/workspace_collaborators_panel.tsx
@@ -24,6 +24,7 @@ export interface WorkspaceCollaboratorInner
 
 export interface WorkspaceCollaboratorsPanelProps {
   label: string;
+  errors?: { [key: number]: string };
   description?: string;
   collaborators: WorkspaceCollaboratorInner[];
   onChange: (value: WorkspaceCollaboratorInner[]) => void;
@@ -33,6 +34,7 @@ export interface WorkspaceCollaboratorsPanelProps {
 
 export const WorkspaceCollaboratorsPanel = ({
   label,
+  errors,
   description,
   collaborators,
   addAnotherButtonLabel,
@@ -91,7 +93,12 @@ export const WorkspaceCollaboratorsPanel = ({
         </>
       )}
       {collaborators.map((item, index) => (
-        <EuiCompressedFormRow key={item.id} fullWidth>
+        <EuiCompressedFormRow
+          key={item.id}
+          fullWidth
+          error={errors?.[item.id]}
+          isInvalid={!!errors?.[item.id]}
+        >
           <WorkspaceCollaboratorInput
             index={index}
             accessLevel={item.accessLevel}
@@ -100,6 +107,7 @@ export const WorkspaceCollaboratorsPanel = ({
             onAccessLevelChange={handleAccessLevelChange}
             onDelete={handleDelete}
             collaboratorIdInputPlaceholder={collaboratorIdInputPlaceholder}
+            error={errors?.[item.id]}
           />
         </EuiCompressedFormRow>
       ))}
diff --git a/src/plugins/workspace/public/components/data_source_association/data_source_association.test.tsx b/src/plugins/workspace/public/components/data_source_association/data_source_association.test.tsx
new file mode 100644
index 000000000000..38391b194af6
--- /dev/null
+++ b/src/plugins/workspace/public/components/data_source_association/data_source_association.test.tsx
@@ -0,0 +1,182 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+
+import { coreMock } from '../../../../../core/public/mocks';
+import {
+  useOpenSearchDashboards,
+  toMountPoint,
+} from '../../../../opensearch_dashboards_react/public';
+import { DataSourceAssociation } from './data_source_association';
+import { AssociationDataSourceModalContent } from '../workspace_detail/association_data_source_modal';
+import { DataSourceConnectionType } from 'src/plugins/workspace/common/types';
+import { BehaviorSubject } from 'rxjs';
+import { IWorkspaceClient } from 'opensearch-dashboards/public';
+
+jest.mock('../../../../opensearch_dashboards_react/public', () => ({
+  ...jest.requireActual('../../../../opensearch_dashboards_react/public'),
+  useOpenSearchDashboards: jest.fn(),
+  toMountPoint: jest.fn(),
+}));
+
+jest.mock('../workspace_detail/association_data_source_modal', () => ({
+  AssociationDataSourceModalContent: jest.fn(),
+}));
+
+describe('<DataSourceAssociation />', () => {
+  let servicesMock: ReturnType<typeof coreMock.createStart>;
+  beforeEach(() => {
+    servicesMock = coreMock.createStart();
+    (useOpenSearchDashboards as jest.Mock).mockImplementation(() => {
+      return { services: servicesMock };
+    });
+    (toMountPoint as jest.Mock).mockImplementation((node: React.ReactNode) => {
+      return () => render(<>{node}</>);
+    });
+    servicesMock.overlays.openModal.mockImplementation((fn) => {
+      fn();
+      return { close: jest.fn(), onClose: jest.fn() };
+    });
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('renders Associate data sources button', () => {
+    render(<DataSourceAssociation excludedDataSourceIds={[]} />);
+    expect(screen.getByText('Associate data sources')).toBeInTheDocument();
+    fireEvent.click(screen.getByTestId('workspaceAssociateDataSourceButton'));
+    expect(screen.getByText('OpenSearch data sources')).toBeInTheDocument();
+    expect(screen.getByText('Direct query data sources')).toBeInTheDocument();
+  });
+
+  it('should open association modal', async () => {
+    (AssociationDataSourceModalContent as jest.Mock).mockImplementation(() => (
+      <div>Mocked association data source modal</div>
+    ));
+    render(<DataSourceAssociation excludedDataSourceIds={[]} />);
+    fireEvent.click(screen.getByTestId('workspaceAssociateDataSourceButton'));
+    fireEvent.click(screen.getByText('OpenSearch data sources'));
+    expect(servicesMock.overlays.openModal).toHaveBeenCalled();
+    expect(screen.getByText('Mocked association data source modal')).toBeInTheDocument();
+  });
+
+  it('should associate data sources successfully', async () => {
+    const associateMock = jest
+      .fn()
+      .mockResolvedValue({ success: true, result: [{ id: 'id1' }, { id: 'id2' }] });
+    servicesMock.workspaces.client$ = new BehaviorSubject<IWorkspaceClient | null>({
+      associate: associateMock,
+      copy: jest.fn(),
+      dissociate: jest.fn(),
+      ui: jest.fn(),
+    });
+    servicesMock.workspaces.currentWorkspaceId$ = new BehaviorSubject<string>('workspace_test');
+
+    (AssociationDataSourceModalContent as jest.Mock).mockImplementation((props: any) => (
+      <button
+        onClick={() =>
+          props.handleAssignDataSourceConnections([
+            { id: 'id1', connectionType: DataSourceConnectionType.OpenSearchConnection },
+            { id: 'id2', connectionType: DataSourceConnectionType.OpenSearchConnection },
+          ])
+        }
+      >
+        Mocked association button
+      </button>
+    ));
+
+    render(<DataSourceAssociation excludedDataSourceIds={[]} />);
+    fireEvent.click(screen.getByTestId('workspaceAssociateDataSourceButton'));
+    fireEvent.click(screen.getByText('OpenSearch data sources'));
+    fireEvent.click(screen.getByText('Mocked association button'));
+    await waitFor(() => {
+      expect(associateMock).toHaveBeenCalled();
+      expect(servicesMock.notifications.toasts.addSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({ title: '2 data sources been associated to the workspace' })
+      );
+    });
+  });
+
+  it('should display error toast when associate data source failed', async () => {
+    const associateMock = jest.fn().mockRejectedValue(new Error());
+    servicesMock.workspaces.client$ = new BehaviorSubject<IWorkspaceClient | null>({
+      associate: associateMock,
+      copy: jest.fn(),
+      dissociate: jest.fn(),
+      ui: jest.fn(),
+    });
+    servicesMock.workspaces.currentWorkspaceId$ = new BehaviorSubject<string>('workspace_test');
+
+    (AssociationDataSourceModalContent as jest.Mock).mockImplementation((props: any) => (
+      <button
+        onClick={() =>
+          props.handleAssignDataSourceConnections([
+            { id: 'id1', connectionType: DataSourceConnectionType.OpenSearchConnection },
+            { id: 'id2', connectionType: DataSourceConnectionType.OpenSearchConnection },
+          ])
+        }
+      >
+        Mocked association button
+      </button>
+    ));
+
+    render(<DataSourceAssociation excludedDataSourceIds={[]} />);
+    fireEvent.click(screen.getByTestId('workspaceAssociateDataSourceButton'));
+    fireEvent.click(screen.getByText('OpenSearch data sources'));
+    fireEvent.click(screen.getByText('Mocked association button'));
+    await waitFor(() => {
+      expect(associateMock).toHaveBeenCalled();
+      expect(servicesMock.notifications.toasts.addDanger).toHaveBeenCalledWith(
+        expect.objectContaining({ title: 'Failed to associate 2 data sources to the workspace' })
+      );
+    });
+  });
+
+  it('should display toast when associate data source partially success', async () => {
+    const associateMock = jest.fn().mockResolvedValue({
+      success: true,
+      // id1 failed to associate with error
+      result: [{ id: 'id1', error: new Error() }, { id: 'id2' }],
+    });
+    servicesMock.workspaces.client$ = new BehaviorSubject<IWorkspaceClient | null>({
+      associate: associateMock,
+      copy: jest.fn(),
+      dissociate: jest.fn(),
+      ui: jest.fn(),
+    });
+    servicesMock.workspaces.currentWorkspaceId$ = new BehaviorSubject<string>('workspace_test');
+
+    (AssociationDataSourceModalContent as jest.Mock).mockImplementation((props: any) => (
+      <button
+        onClick={() =>
+          props.handleAssignDataSourceConnections([
+            { id: 'id1', connectionType: DataSourceConnectionType.OpenSearchConnection },
+            { id: 'id2', connectionType: DataSourceConnectionType.OpenSearchConnection },
+          ])
+        }
+      >
+        Mocked association button
+      </button>
+    ));
+
+    render(<DataSourceAssociation excludedDataSourceIds={[]} />);
+    fireEvent.click(screen.getByTestId('workspaceAssociateDataSourceButton'));
+    fireEvent.click(screen.getByText('OpenSearch data sources'));
+    fireEvent.click(screen.getByText('Mocked association button'));
+    await waitFor(() => {
+      expect(associateMock).toHaveBeenCalled();
+      expect(servicesMock.notifications.toasts.addDanger).toHaveBeenCalledWith(
+        expect.objectContaining({ title: 'Failed to associate 1 data source to the workspace' })
+      );
+      expect(servicesMock.notifications.toasts.addSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({ title: '1 data source been associated to the workspace' })
+      );
+    });
+  });
+});
diff --git a/src/plugins/workspace/public/components/data_source_association/data_source_association.tsx b/src/plugins/workspace/public/components/data_source_association/data_source_association.tsx
new file mode 100644
index 000000000000..19a14946d1b7
--- /dev/null
+++ b/src/plugins/workspace/public/components/data_source_association/data_source_association.tsx
@@ -0,0 +1,187 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  EuiButton,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
+  EuiIcon,
+  EuiPopover,
+} from '@elastic/eui';
+import React, { useCallback, useState, useRef } from 'react';
+import { i18n } from '@osd/i18n';
+import { useObservable } from 'react-use';
+import { of } from 'rxjs';
+import { OverlayRef } from '../../../../../../src/core/public';
+import {
+  toMountPoint,
+  useOpenSearchDashboards,
+} from '../../../../opensearch_dashboards_react/public';
+import { AssociationDataSourceModalContent } from '../workspace_detail/association_data_source_modal';
+import { AssociationDataSourceModalMode } from '../../../common/constants';
+import { DataSourceConnection, DataSourceConnectionType } from '../../../common/types';
+
+interface Props {
+  excludedDataSourceIds: string[];
+  onComplete?: () => void;
+  onError?: () => void;
+}
+
+export const DataSourceAssociation = ({ excludedDataSourceIds, onComplete, onError }: Props) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const associationModalRef = useRef<OverlayRef>();
+
+  const {
+    chrome,
+    savedObjects,
+    http,
+    notifications,
+    overlays,
+    workspaces,
+  } = useOpenSearchDashboards().services;
+  const workspaceClient = useObservable(workspaces?.client$ ?? of(null));
+  const currentWorkspaceId = useObservable(workspaces?.currentWorkspaceId$ ?? of(null));
+
+  const closePopover = useCallback(() => {
+    setIsOpen(false);
+  }, []);
+
+  const openPopover = useCallback(() => {
+    setIsOpen(true);
+  }, []);
+
+  const onAssociateDataSource = useCallback(
+    async (ds: DataSourceConnection[]) => {
+      const objects = ds
+        .filter((d) => d.connectionType === DataSourceConnectionType.OpenSearchConnection)
+        .map((d) => ({ id: d.id, type: 'data-source' }));
+
+      if (workspaceClient && currentWorkspaceId) {
+        let failedCount = 0;
+        try {
+          const res = await workspaceClient.associate(objects, currentWorkspaceId);
+
+          if (res.success) {
+            failedCount = res.result.filter((r) => !!r.error).length;
+          } else {
+            // If failed to workspaceClient.associate, all data sources association is failed
+            failedCount = objects.length;
+          }
+          if (onComplete) {
+            onComplete();
+          }
+        } catch (e) {
+          failedCount = objects.length;
+          if (onError) {
+            onError();
+          }
+        } finally {
+          associationModalRef.current?.close();
+        }
+
+        if (failedCount > 0) {
+          notifications?.toasts.addDanger({
+            id: 'workspace_data_source_association_failed',
+            title: i18n.translate('workspace.dataSource.association.failedTitle', {
+              defaultMessage:
+                'Failed to associate {failedCount, plural, one {# data source} other {# data sources}} to the workspace',
+              values: { failedCount },
+            }),
+          });
+        }
+        if (failedCount < objects.length) {
+          notifications?.toasts.addSuccess({
+            id: 'workspace_data_source_association_succeed',
+            title: i18n.translate('workspace.dataSource.association.succeedTitle', {
+              defaultMessage:
+                '{succeedCount, plural, one {# data source} other {# data sources}} been associated to the workspace',
+              values: { succeedCount: objects.length - failedCount },
+            }),
+          });
+        }
+      }
+    },
+    [workspaceClient, currentWorkspaceId, notifications, onComplete, onError]
+  );
+
+  const showAssociationModal = useCallback(
+    (mode: AssociationDataSourceModalMode) => {
+      closePopover();
+      if (overlays && savedObjects && chrome) {
+        associationModalRef.current = overlays.openModal(
+          toMountPoint(
+            <AssociationDataSourceModalContent
+              http={http}
+              savedObjects={savedObjects}
+              notifications={notifications}
+              excludedConnectionIds={excludedDataSourceIds}
+              closeModal={() => associationModalRef.current?.close()}
+              handleAssignDataSourceConnections={onAssociateDataSource}
+              mode={mode}
+              logos={chrome.logos}
+            />
+          )
+        );
+      }
+    },
+    [
+      overlays,
+      chrome,
+      http,
+      notifications,
+      savedObjects,
+      closePopover,
+      excludedDataSourceIds,
+      onAssociateDataSource,
+    ]
+  );
+
+  const button = (
+    <EuiButton
+      data-test-subj="workspaceAssociateDataSourceButton"
+      size="s"
+      fill
+      iconType="arrowDown"
+      iconSide="right"
+      onClick={openPopover}
+    >
+      <EuiIcon type="plusInCircle" />{' '}
+      {i18n.translate('workspace.dataSources.associationButton.label', {
+        defaultMessage: 'Associate data sources',
+      })}
+    </EuiButton>
+  );
+
+  const items = [
+    <EuiContextMenuItem
+      key="opensearchDataSources"
+      onClick={() => showAssociationModal(AssociationDataSourceModalMode.OpenSearchConnections)}
+    >
+      {i18n.translate('workspace.dataSources.associationButton.opensearch.label', {
+        defaultMessage: 'OpenSearch data sources',
+      })}
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem
+      key="directQueryDataSources"
+      onClick={() => showAssociationModal(AssociationDataSourceModalMode.DirectQueryConnections)}
+    >
+      {i18n.translate('workspace.dataSources.associationButton.directQuery.label', {
+        defaultMessage: 'Direct query data sources',
+      })}
+    </EuiContextMenuItem>,
+  ];
+
+  return (
+    <EuiPopover
+      button={button}
+      isOpen={isOpen}
+      closePopover={closePopover}
+      panelPaddingSize="none"
+      anchorPosition="downLeft"
+    >
+      <EuiContextMenuPanel items={items} />
+    </EuiPopover>
+  );
+};
diff --git a/src/plugins/workspace/public/components/global_search/page_item.test.tsx b/src/plugins/workspace/public/components/global_search/page_item.test.tsx
new file mode 100644
index 000000000000..486d600738c4
--- /dev/null
+++ b/src/plugins/workspace/public/components/global_search/page_item.test.tsx
@@ -0,0 +1,268 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { fireEvent, render } from '@testing-library/react';
+import { GlobalSearchPageItem } from './page_item';
+import { coreMock } from '../../../../../core/public/mocks';
+import { BehaviorSubject } from 'rxjs';
+import { WorkspaceUseCase } from '../../types';
+import {
+  ChromeNavLink,
+  ChromeRegistrationNavLink,
+  NavGroupItemInMap,
+} from 'opensearch-dashboards/public';
+
+import { NavGroupType } from '../../../../../core/public';
+
+describe('PageItem', () => {
+  const currentWorkspace = {
+    id: 'foo',
+    name: 'Workspace 1',
+  };
+
+  const link = {
+    id: 'appId',
+    title: 'App 1',
+    navGroup: {
+      title: 'Essential',
+      type: undefined,
+      description: '',
+    },
+    category: {
+      id: 'observability',
+      label: 'Observability',
+    },
+  } as ChromeRegistrationNavLink & ChromeNavLink & { navGroup: NavGroupItemInMap };
+
+  const coreStartMock = coreMock.createStart();
+  const { application, http } = coreStartMock;
+
+  const registeredUseCases = new BehaviorSubject([
+    {
+      id: 'foo',
+      title: 'Foo',
+      features: [{ id: 'system-feature', title: 'System feature' }],
+      systematic: true,
+      description: '',
+    } as WorkspaceUseCase,
+  ]);
+
+  const assignMock = jest.fn();
+
+  // Mock window.location.assign
+  Object.defineProperty(window, 'location', {
+    value: {
+      assign: assignMock,
+    },
+    writable: true,
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the page item correctly', () => {
+    const { getByText } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={link}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+      />
+    );
+
+    // workspace name and link title
+    expect(getByText('Workspace 1')).toBeInTheDocument();
+    expect(getByText('App 1')).toBeInTheDocument();
+  });
+
+  it('renders the page item correctly for non workspace pages', () => {
+    const settingsLink = {
+      ...link,
+      navGroup: {
+        id: 'settings',
+        title: 'Settings',
+        description: 'Settings',
+        type: NavGroupType.SYSTEM,
+        navLinks: [],
+      },
+    };
+    const { getByText } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={settingsLink}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+      />
+    );
+
+    // workspace name and link title
+    expect(getByText('Settings')).toBeInTheDocument();
+    expect(getByText('App 1')).toBeInTheDocument();
+  });
+
+  it('renders the page item correctly for non workspace landing page', () => {
+    const settingsLink = {
+      ...link,
+      navGroup: {
+        id: 'settings',
+        title: 'Settings',
+        description: 'Settings',
+        type: NavGroupType.SYSTEM,
+        navLinks: [],
+      },
+      id: 'app_landing',
+      title: 'Overview',
+    };
+
+    const { getByText } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={settingsLink}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+      />
+    );
+
+    // nav group title and page title
+    expect(getByText('Settings')).toBeInTheDocument();
+    expect(getByText('Settings Overview')).toBeInTheDocument();
+  });
+
+  it('renders the page item correctly for non workspace overview page', () => {
+    const settingsLink = {
+      ...link,
+      category: { label: 'Security Analytics', id: 'sa' },
+      id: 'sa_overview',
+      title: 'Overview',
+    };
+
+    const { getByText } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={settingsLink}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+      />
+    );
+
+    // workspace name and link title
+    expect(getByText('Workspace 1')).toBeInTheDocument();
+    expect(getByText('Security Analytics')).toBeInTheDocument();
+    expect(getByText('Overview')).toBeInTheDocument();
+  });
+
+  it('click on the item will navigate to corresponding page', () => {
+    const settingsLink = {
+      ...link,
+      category: { label: 'Security Analytics', id: 'sa' },
+      id: 'sa_overview',
+      title: 'Overview',
+    };
+
+    const callbackFn = jest.fn();
+
+    const { getByText, getByTestId } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={settingsLink}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+        callback={callbackFn}
+      />
+    );
+
+    // workspace name and link title
+    expect(getByText('Workspace 1')).toBeInTheDocument();
+    expect(getByText('Security Analytics')).toBeInTheDocument();
+    expect(getByText('Overview')).toBeInTheDocument();
+
+    fireEvent.click(getByTestId('global-search-item-sa_overview'));
+    expect(application.navigateToApp).toBeCalledWith('sa_overview');
+    expect(callbackFn).toBeCalled();
+  });
+
+  it('click on the item will navigate to correctly page for data source out of workspace', () => {
+    const navLink = {
+      ...link,
+      href: 'http://localhost:5601/w/foo/app/data_source',
+      navGroup: {
+        id: 'admin',
+        description: '',
+        title: 'Data administration',
+        type: NavGroupType.SYSTEM,
+        navLinks: [],
+      },
+      id: 'data_source',
+      title: 'Data source',
+    };
+
+    const callbackFn = jest.fn();
+
+    const { getByText, getByTestId } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={navLink}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+        callback={callbackFn}
+      />
+    );
+
+    expect(getByText('Data administration')).toBeInTheDocument();
+    expect(getByText('Data source')).toBeInTheDocument();
+
+    fireEvent.click(getByTestId('global-search-item-data_source'));
+    expect(application.navigateToApp).not.toHaveBeenCalled();
+    expect(assignMock).toHaveBeenCalledWith('http://localhost:5601/app/data_source');
+  });
+
+  it('click on the item will navigate to correctly page for data source in a workspace', () => {
+    const navLink = {
+      ...link,
+      href: 'http://localhost:5601/w/foo/app/data_source',
+      navGroup: {
+        id: 'sa',
+        description: '',
+        title: 'Security Analytics',
+        navLinks: [],
+      },
+      id: 'data_source',
+      title: 'Data source',
+    };
+
+    const callbackFn = jest.fn();
+
+    const { getByText, getByTestId } = render(
+      <GlobalSearchPageItem
+        currentWorkspace={currentWorkspace}
+        link={navLink}
+        http={http}
+        application={application}
+        registeredUseCases$={registeredUseCases}
+        search="abc"
+        callback={callbackFn}
+      />
+    );
+
+    expect(getByText('Data source')).toBeInTheDocument();
+
+    fireEvent.click(getByTestId('global-search-item-data_source'));
+    expect(application.navigateToApp).toBeCalledWith('data_source');
+  });
+});
diff --git a/src/plugins/workspace/public/components/global_search/page_item.tsx b/src/plugins/workspace/public/components/global_search/page_item.tsx
new file mode 100644
index 000000000000..c3295f0bc671
--- /dev/null
+++ b/src/plugins/workspace/public/components/global_search/page_item.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHighlight,
+  EuiIcon,
+  EuiSimplifiedBreadcrumbs,
+} from '@elastic/eui';
+import {
+  ApplicationStart,
+  ChromeNavLink,
+  ChromeRegistrationNavLink,
+  HttpStart,
+  NavGroupItemInMap,
+  WorkspaceObject,
+} from 'opensearch-dashboards/public';
+import React from 'react';
+import { BehaviorSubject } from 'rxjs';
+import { useObservable } from 'react-use';
+import { WorkspaceTitleDisplay } from '../workspace_name/workspace_name';
+import { WorkspaceUseCase } from '../../types';
+import { NavGroupType } from '../../../../../core/public';
+import { formatUrlWithWorkspaceId } from '../../../../../core/public/utils';
+
+interface Props {
+  currentWorkspace: WorkspaceObject | null;
+  link: ChromeRegistrationNavLink & ChromeNavLink & { navGroup: NavGroupItemInMap };
+  application: ApplicationStart;
+  http: HttpStart;
+  registeredUseCases$: BehaviorSubject<WorkspaceUseCase[]>;
+  search: string;
+  callback?: () => void;
+}
+
+export const GlobalSearchPageItem = ({
+  link,
+  currentWorkspace,
+  application,
+  http,
+  registeredUseCases$,
+  search,
+  callback,
+}: Props) => {
+  const availableUseCases = useObservable(registeredUseCases$);
+  const breadcrumbs = [];
+  const isPageOutOfWorkspace = link.navGroup.type === NavGroupType.SYSTEM;
+
+  const navGroupElement = (navGroup: NavGroupItemInMap) => (
+    <EuiFlexGroup gutterSize="s" alignItems="center">
+      {navGroup.icon && (
+        <EuiFlexItem>
+          <EuiIcon type={navGroup.icon} color="text" />
+        </EuiFlexItem>
+      )}
+      <EuiFlexItem>{navGroup.title}</EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  if (currentWorkspace && !isPageOutOfWorkspace) {
+    breadcrumbs.push({
+      text: (
+        <WorkspaceTitleDisplay
+          workspace={currentWorkspace}
+          availableUseCases={availableUseCases || []}
+        />
+      ),
+    });
+  } else {
+    breadcrumbs.push({ text: navGroupElement(link.navGroup) });
+  }
+  const appId = link.id.toLowerCase();
+  const isLanding = appId.endsWith('landing');
+  const text = (
+    <EuiHighlight search={search} highlightAll={true}>
+      {isLanding ? `${link.navGroup.title} ${link.title}` : link.title}
+    </EuiHighlight>
+  );
+
+  const isOverviewPage = appId.endsWith('overview');
+  if (isOverviewPage && link.category) {
+    breadcrumbs.push({ text: link.category.label });
+  }
+
+  if (link.parentNavLinkId) {
+    const parentNavLinkTitle = link.navGroup.navLinks.find(
+      (navLink) => navLink.id === link.parentNavLinkId
+    )?.title;
+    breadcrumbs.push({ text: parentNavLinkTitle });
+  }
+
+  const onNavItemClick = () => {
+    callback?.();
+    if (isPageOutOfWorkspace && currentWorkspace) {
+      // remove workspace information in the URL, special handling for data source which could visible both in/out workspace
+      const urlWithoutWorkspace = formatUrlWithWorkspaceId(link.href, '', http.basePath);
+      window.location.assign(urlWithoutWorkspace);
+      return;
+    }
+    application.navigateToApp(link.id);
+  };
+
+  breadcrumbs.push({
+    text,
+    onClick: () => {},
+  });
+
+  return (
+    <div
+      key={link.id}
+      aria-hidden="true"
+      data-test-subj={`global-search-item-${link.id}`}
+      onClick={() => {
+        onNavItemClick();
+      }}
+    >
+      <EuiSimplifiedBreadcrumbs breadcrumbs={breadcrumbs} hideTrailingSeparator responsive />
+    </div>
+  );
+};
diff --git a/src/plugins/workspace/public/components/global_search/search_pages_command.test.tsx b/src/plugins/workspace/public/components/global_search/search_pages_command.test.tsx
new file mode 100644
index 000000000000..d3ddf66b24c4
--- /dev/null
+++ b/src/plugins/workspace/public/components/global_search/search_pages_command.test.tsx
@@ -0,0 +1,125 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { searchPages } from './search_pages_command';
+import { WorkspaceUseCase } from '../../types';
+import { BehaviorSubject } from 'rxjs';
+import { coreMock } from '../../../../../core/public/mocks';
+import { NavGroupItemInMap, WorkspaceObject } from 'opensearch-dashboards/public';
+
+describe('<SearchPagesCommand />', () => {
+  const registeredUseCases = new BehaviorSubject([
+    {
+      id: 'foo',
+      title: 'Foo',
+      features: [{ id: 'system-feature', title: 'System feature' }],
+      systematic: true,
+      description: '',
+    } as WorkspaceUseCase,
+  ]);
+
+  const currentWorkspace: WorkspaceObject = {
+    id: 'mock-workspace',
+    name: 'mock-workspace',
+    features: ['use-case-foo-group'],
+  };
+
+  const navGroup: Record<string, NavGroupItemInMap> = {
+    'foo-group': {
+      id: 'foo-group',
+      title: 'Foo Group',
+      description: 'Foo Group description',
+      navLinks: [
+        {
+          id: 'foo-group-link1',
+          title: 'Foo Group Link 1',
+        },
+        {
+          id: 'foo-group-link2',
+          title: 'Foo Group Link 2',
+        },
+        {
+          id: 'foo-group-link3',
+          title: 'Foo Group Link 3',
+          hidden: true,
+        },
+      ],
+    },
+    dataAdministration: {
+      id: 'dataAdministration',
+      title: 'Data Administration',
+      description: 'Data Administration description',
+      navLinks: [
+        {
+          id: 'dataAdministration-link1',
+          title: 'Data Administration Link 1',
+        },
+        {
+          id: 'dataAdministration-link1',
+          title: 'Data Administration Link 2',
+        },
+      ],
+    },
+    settingsAndSetup: {
+      id: 'settingsAndSetup',
+      title: 'Settings and Setup',
+      description: 'Settings and Setup description',
+      navLinks: [
+        {
+          id: 'settingsAndSetup-link1',
+          title: 'Settings and Setup Link 1',
+        },
+        {
+          id: 'settingsAndSetup-link1',
+          title: 'Settings and Setup Link 2',
+        },
+      ],
+    },
+  };
+
+  const mock = coreMock.createStart();
+  const coreStartMock = {
+    ...mock,
+    chrome: {
+      ...mock.chrome,
+      navGroup: {
+        ...mock.chrome.navGroup,
+        getNavGroupsMap$: () => new BehaviorSubject(navGroup),
+      },
+    },
+    workspaces: {
+      ...mock.workspaces,
+      currentWorkspace$: new BehaviorSubject<WorkspaceObject | null>(currentWorkspace),
+    },
+  };
+
+  const callbackFn = jest.fn();
+
+  it('search return empty result', async () => {
+    const searchResult = await searchPages('bar', registeredUseCases, coreStartMock, callbackFn);
+
+    expect(searchResult).toHaveLength(0);
+  });
+
+  it('search return matched result', async () => {
+    const searchResult = await searchPages('foo', registeredUseCases, coreStartMock, callbackFn);
+
+    expect(searchResult).toHaveLength(2);
+  });
+
+  it('search return pages out of workspace', async () => {
+    let searchResult = await searchPages('Settings', registeredUseCases, coreStartMock, callbackFn);
+
+    expect(searchResult).toHaveLength(2);
+
+    searchResult = await searchPages(
+      'Administration',
+      registeredUseCases,
+      coreStartMock,
+      callbackFn
+    );
+    expect(searchResult).toHaveLength(2);
+  });
+});
diff --git a/src/plugins/workspace/public/components/global_search/search_pages_command.tsx b/src/plugins/workspace/public/components/global_search/search_pages_command.tsx
new file mode 100644
index 000000000000..0aa73a11088b
--- /dev/null
+++ b/src/plugins/workspace/public/components/global_search/search_pages_command.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChromeNavLink, ChromeRegistrationNavLink, CoreStart } from 'opensearch-dashboards/public';
+import { first } from 'rxjs/operators';
+import React, { ReactNode } from 'react';
+import { BehaviorSubject } from 'rxjs';
+import { getFirstUseCaseOfFeatureConfigs } from '../../utils';
+import { GlobalSearchPageItem } from './page_item';
+import { DEFAULT_NAV_GROUPS, NavGroupType } from '../../../../../core/public';
+import { WorkspaceUseCase } from '../../types';
+
+export const searchPages = async (
+  query: string,
+  registeredUseCases$: BehaviorSubject<WorkspaceUseCase[]>,
+  coreStart?: CoreStart,
+  callback?: () => void
+): Promise<ReactNode[]> => {
+  if (coreStart) {
+    const currentWorkspace = await coreStart.workspaces.currentWorkspace$.pipe(first()).toPromise();
+
+    const navGroupMap = await coreStart.chrome.navGroup
+      .getNavGroupsMap$()
+      .pipe(first())
+      .toPromise();
+
+    const allAvailableCaseId = Object.entries(DEFAULT_NAV_GROUPS)
+      .filter(([key, value]) => {
+        return value.type === NavGroupType.SYSTEM;
+      })
+      .map(([key, value]) => key);
+
+    allAvailableCaseId.push(
+      getFirstUseCaseOfFeatureConfigs(currentWorkspace?.features || []) || ''
+    );
+
+    const searchResult = allAvailableCaseId.flatMap((useCaseId) => {
+      const navGroup = navGroupMap[useCaseId];
+      if (navGroup) {
+        const links = navGroup.navLinks as Array<ChromeRegistrationNavLink & ChromeNavLink>;
+        // parent nav links are not clickable
+        const parentNavLinkIds = links.map((link) => link.parentNavLinkId).filter((link) => !!link);
+        return links
+          .filter(
+            (link) =>
+              !link.hidden &&
+              !link.disabled &&
+              link.title &&
+              link.title.toLowerCase().includes(query.toLowerCase()) &&
+              !parentNavLinkIds.includes(link.id)
+          )
+          .map((link) => ({
+            ...link,
+            navGroup,
+          }));
+      }
+      return [];
+    });
+
+    const pages = searchResult.slice(0, 10).map((link) => {
+      return (
+        <GlobalSearchPageItem
+          link={link}
+          search={query}
+          currentWorkspace={currentWorkspace}
+          application={coreStart.application}
+          http={coreStart.http}
+          registeredUseCases$={registeredUseCases$}
+          callback={callback}
+        />
+      );
+    });
+
+    return pages;
+  }
+  return [];
+};
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_creator.test.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_creator.test.tsx
index 95797ffe81c8..c813f4b3fef4 100644
--- a/src/plugins/workspace/public/components/workspace_creator/workspace_creator.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_creator/workspace_creator.test.tsx
@@ -18,6 +18,7 @@ import {
 import { DataSourceEngineType } from '../../../../data_source/common/data_sources';
 import { DataSourceConnectionType } from '../../../common/types';
 import * as utils from '../../utils';
+import * as workspaceUtilsExports from '../utils/workspace';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -113,8 +114,15 @@ jest.spyOn(utils, 'fetchDataSourceConnections').mockImplementation(async (passed
 const WorkspaceCreator = ({
   isDashboardAdmin = false,
   dataSourceEnabled = false,
+  isPermissionEnabled = true,
   ...props
-}: Partial<WorkspaceCreatorProps & { isDashboardAdmin: boolean; dataSourceEnabled?: boolean }>) => {
+}: Partial<
+  WorkspaceCreatorProps & {
+    isDashboardAdmin: boolean;
+    dataSourceEnabled?: boolean;
+    isPermissionEnabled?: boolean;
+  }
+>) => {
   const { Provider } = createOpenSearchDashboardsReactContext({
     ...mockCoreStart,
     ...{
@@ -123,7 +131,7 @@ const WorkspaceCreator = ({
         capabilities: {
           ...mockCoreStart.application.capabilities,
           workspaces: {
-            permissionEnabled: true,
+            permissionEnabled: isPermissionEnabled,
           },
           dashboards: {
             isDashboardAdmin,
@@ -273,8 +281,12 @@ describe('WorkspaceCreator', () => {
         dataSources: [],
         dataConnections: [],
         permissions: {
-          library_write: { users: ['%me%'] },
-          write: { users: ['%me%'] },
+          library_write: {
+            users: ['%me%'],
+          },
+          write: {
+            users: ['%me%'],
+          },
         },
       }
     );
@@ -328,43 +340,6 @@ describe('WorkspaceCreator', () => {
     expect(notificationToastsAddSuccess).not.toHaveBeenCalled();
   });
 
-  it('create workspace with customized permissions', async () => {
-    const { getByTestId } = render(<WorkspaceCreator />);
-
-    // Ensure workspace create form rendered
-    await waitFor(() => {
-      expect(getByTestId('workspaceForm-bottomBar-createButton')).toBeInTheDocument();
-    });
-    const nameInput = getByTestId('workspaceForm-workspaceDetails-nameInputText');
-    fireEvent.input(nameInput, {
-      target: { value: 'test workspace name' },
-    });
-    fireEvent.click(getByTestId('workspaceUseCase-observability'));
-    fireEvent.click(getByTestId('workspaceForm-permissionSettingPanel-addNew'));
-    fireEvent.click(getByTestId('workspaceForm-bottomBar-createButton'));
-    expect(workspaceClientCreate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        name: 'test workspace name',
-      }),
-      {
-        dataConnections: [],
-        dataSources: [],
-        permissions: {
-          write: {
-            users: ['%me%'],
-          },
-          library_write: {
-            users: ['%me%'],
-          },
-        },
-      }
-    );
-    await waitFor(() => {
-      expect(notificationToastsAddSuccess).toHaveBeenCalled();
-    });
-    expect(notificationToastsAddDanger).not.toHaveBeenCalled();
-  });
-
   it('create workspace with customized selected dataSources', async () => {
     Object.defineProperty(HTMLElement.prototype, 'offsetHeight', {
       configurable: true,
@@ -391,7 +366,7 @@ describe('WorkspaceCreator', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
       expect(getByText(dataSourcesList[0].title)).toBeInTheDocument();
@@ -404,18 +379,10 @@ describe('WorkspaceCreator', () => {
       expect.objectContaining({
         name: 'test workspace name',
       }),
-      {
+      expect.objectContaining({
         dataConnections: [],
         dataSources: ['id1'],
-        permissions: {
-          library_write: {
-            users: ['%me%'],
-          },
-          write: {
-            users: ['%me%'],
-          },
-        },
-      }
+      })
     );
     await waitFor(() => {
       expect(notificationToastsAddSuccess).toHaveBeenCalled();
@@ -449,7 +416,7 @@ describe('WorkspaceCreator', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
       expect(getByText(dataSourcesList[2].title)).toBeInTheDocument();
@@ -462,17 +429,40 @@ describe('WorkspaceCreator', () => {
       expect.objectContaining({
         name: 'test workspace name',
       }),
-      {
+      expect.objectContaining({
         dataConnections: ['id3'],
         dataSources: [],
-        permissions: {
-          library_write: {
-            users: ['%me%'],
-          },
-          write: {
-            users: ['%me%'],
-          },
-        },
+      })
+    );
+    await waitFor(() => {
+      expect(notificationToastsAddSuccess).toHaveBeenCalled();
+    });
+    expect(notificationToastsAddDanger).not.toHaveBeenCalled();
+  });
+
+  it('should not include permissions parameter if permissions not enabled', async () => {
+    const { getByTestId } = render(
+      <WorkspaceCreator isDashboardAdmin={true} isPermissionEnabled={false} />
+    );
+
+    // Ensure workspace create form rendered
+    await waitFor(() => {
+      expect(getByTestId('workspaceForm-bottomBar-createButton')).toBeInTheDocument();
+    });
+    const nameInput = getByTestId('workspaceForm-workspaceDetails-nameInputText');
+    fireEvent.input(nameInput, {
+      target: { value: 'test workspace name' },
+    });
+    fireEvent.click(getByTestId('workspaceUseCase-observability'));
+
+    fireEvent.click(getByTestId('workspaceForm-bottomBar-createButton'));
+    expect(workspaceClientCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'test workspace name',
+      }),
+      {
+        dataConnections: [],
+        dataSources: [],
       }
     );
     await waitFor(() => {
@@ -510,8 +500,8 @@ describe('WorkspaceCreator', () => {
     });
   });
 
-  it('should redirect to workspace use case landing page after created successfully', async () => {
-    const { getByTestId } = render(<WorkspaceCreator />);
+  it('should redirect to workspace use case landing page if permission not enabled', async () => {
+    const { getByTestId } = render(<WorkspaceCreator isPermissionEnabled={false} />);
 
     // Ensure workspace create form rendered
     await waitFor(() => {
@@ -529,4 +519,32 @@ describe('WorkspaceCreator', () => {
     });
     jest.useRealTimers();
   });
+
+  it('should redirect to workspace setting collaborators tab if permission enabled', async () => {
+    const { getByTestId } = render(<WorkspaceCreator />);
+    const navigateToWorkspaceDetailMock = jest.fn();
+    jest
+      .spyOn(workspaceUtilsExports, 'navigateToWorkspaceDetail')
+      .mockImplementation(navigateToWorkspaceDetailMock);
+
+    // Ensure workspace create form rendered
+    await waitFor(() => {
+      expect(getByTestId('workspaceForm-bottomBar-createButton')).toBeInTheDocument();
+    });
+    const nameInput = getByTestId('workspaceForm-workspaceDetails-nameInputText');
+    fireEvent.input(nameInput, {
+      target: { value: 'test workspace name' },
+    });
+    fireEvent.click(getByTestId('workspaceForm-bottomBar-createButton'));
+    jest.useFakeTimers();
+    jest.runAllTimers();
+    await waitFor(() => {
+      expect(navigateToWorkspaceDetailMock).toHaveBeenCalledWith(
+        expect.anything(),
+        'successResult',
+        'collaborators'
+      );
+    });
+    jest.useRealTimers();
+  });
 });
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_creator.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_creator.tsx
index 9b51ba22d0fe..061649304331 100644
--- a/src/plugins/workspace/public/components/workspace_creator/workspace_creator.tsx
+++ b/src/plugins/workspace/public/components/workspace_creator/workspace_creator.tsx
@@ -7,22 +7,31 @@ import React, { useCallback, useState, useMemo } from 'react';
 import { EuiPage, EuiPageBody, EuiPageContent, euiPaletteColorBlind } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import { BehaviorSubject } from 'rxjs';
-
 import { useLocation } from 'react-router-dom';
+
 import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
-import { WorkspaceFormSubmitData, WorkspaceOperationType } from '../workspace_form';
-import { WORKSPACE_DETAIL_APP_ID } from '../../../common/constants';
+import { PermissionModeId } from '../../../../../core/public';
+import { CURRENT_USER_PLACEHOLDER, WORKSPACE_DETAIL_APP_ID } from '../../../common/constants';
+import {
+  WorkspaceFormSubmitData,
+  WorkspaceOperationType,
+  DetailTab,
+  WorkspacePermissionItemType,
+  convertPermissionSettingsToPermissions,
+  WorkspacePermissionSetting,
+} from '../workspace_form';
 import { getUseCaseFeatureConfig } from '../../../common/utils';
 import { formatUrlWithWorkspaceId } from '../../../../../core/public/utils';
 import { WorkspaceClient } from '../../workspace_client';
-import { convertPermissionSettingsToPermissions } from '../workspace_form';
 import { DataSourceManagementPluginSetup } from '../../../../../plugins/data_source_management/public';
 import { WorkspaceUseCase } from '../../types';
 import { getFirstUseCaseOfFeatureConfigs } from '../../utils';
 import { useFormAvailableUseCases } from '../workspace_form/use_form_available_use_cases';
 import { NavigationPublicPluginStart } from '../../../../../plugins/navigation/public';
 import { DataSourceConnectionType } from '../../../common/types';
+import { navigateToWorkspaceDetail } from '../utils/workspace';
 import { WorkspaceCreatorForm } from './workspace_creator_form';
+import { optionIdToWorkspacePermissionModesMap } from '../workspace_form/constants';
 
 export interface WorkspaceCreatorProps {
   registeredUseCases$: BehaviorSubject<WorkspaceUseCase[]>;
@@ -46,8 +55,8 @@ export const WorkspaceCreator = (props: WorkspaceCreatorProps) => {
     navigationUI: NavigationPublicPluginStart['ui'];
   }>();
   const [isFormSubmitting, setIsFormSubmitting] = useState(false);
-
   const isPermissionEnabled = application?.capabilities.workspaces.permissionEnabled;
+
   const { isOnlyAllowEssential, availableUseCases } = useFormAvailableUseCases({
     savedObjects,
     registeredUseCases$,
@@ -73,8 +82,20 @@ export const WorkspaceCreator = (props: WorkspaceCreatorProps) => {
             features: [getUseCaseFeatureConfig(defaultSelectedUseCase.id)],
           }
         : {}),
+      ...(isPermissionEnabled
+        ? {
+            permissionSettings: [
+              {
+                id: 1,
+                type: WorkspacePermissionItemType.User,
+                userId: CURRENT_USER_PLACEHOLDER,
+                modes: optionIdToWorkspacePermissionModesMap[PermissionModeId.Owner],
+              },
+            ] as WorkspacePermissionSetting[],
+          }
+        : {}),
     };
-  }, [location.search, availableUseCases]);
+  }, [location.search, availableUseCases, isPermissionEnabled]);
 
   const handleWorkspaceFormSubmit = useCallback(
     async (data: WorkspaceFormSubmitData) => {
@@ -102,7 +123,11 @@ export const WorkspaceCreator = (props: WorkspaceCreatorProps) => {
         result = await workspaceClient.create(attributes, {
           dataSources: selectedDataSourceIds,
           dataConnections: selectedDataConnectionIds,
-          permissions: convertPermissionSettingsToPermissions(permissionSettings),
+          ...(isPermissionEnabled
+            ? {
+                permissions: convertPermissionSettingsToPermissions(permissionSettings),
+              }
+            : {}),
         });
         if (result?.success) {
           notifications?.toasts.addSuccess({
@@ -117,6 +142,14 @@ export const WorkspaceCreator = (props: WorkspaceCreatorProps) => {
               ?.features[0].id;
             // Redirect page after one second, leave one second time to show create successful toast.
             window.setTimeout(() => {
+              if (isPermissionEnabled) {
+                navigateToWorkspaceDetail(
+                  { application, http },
+                  newWorkspaceId,
+                  DetailTab.Collaborators
+                );
+                return;
+              }
               window.location.href = formatUrlWithWorkspaceId(
                 application.getUrlForApp(useCaseLandingAppId || WORKSPACE_DETAIL_APP_ID, {
                   absolute: true,
@@ -142,7 +175,15 @@ export const WorkspaceCreator = (props: WorkspaceCreatorProps) => {
         setIsFormSubmitting(false);
       }
     },
-    [notifications?.toasts, http, application, workspaceClient, isFormSubmitting, availableUseCases]
+    [
+      notifications?.toasts,
+      http,
+      application,
+      workspaceClient,
+      isFormSubmitting,
+      availableUseCases,
+      isPermissionEnabled,
+    ]
   );
 
   const isFormReadyToRender =
@@ -177,7 +218,6 @@ export const WorkspaceCreator = (props: WorkspaceCreatorProps) => {
               savedObjects={savedObjects}
               onSubmit={handleWorkspaceFormSubmit}
               operationType={WorkspaceOperationType.Create}
-              permissionEnabled={isPermissionEnabled}
               dataSourceManagement={dataSourceManagement}
               availableUseCases={availableUseCases}
               defaultValues={defaultWorkspaceFormValues}
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.test.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.test.tsx
index 0b17d9adae7e..d27d41e7ef7d 100644
--- a/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.test.tsx
@@ -66,6 +66,6 @@ describe('WorkspaceForm', () => {
   it('should not display data source panel when data source is disabled', () => {
     const { queryByText } = setup(true, undefined);
 
-    expect(queryByText('Associate data source')).not.toBeInTheDocument();
+    expect(queryByText('Associate data sources')).not.toBeInTheDocument();
   });
 });
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.tsx
index 52e2dd4e840e..89af611784e4 100644
--- a/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.tsx
+++ b/src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.tsx
@@ -3,24 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useCallback, useRef } from 'react';
-import {
-  EuiSpacer,
-  EuiForm,
-  EuiText,
-  EuiFlexItem,
-  EuiFlexGroup,
-  EuiDescribedFormGroup,
-  EuiPanel,
-} from '@elastic/eui';
+import React from 'react';
+import { EuiSpacer, EuiForm, EuiText, EuiFlexItem, EuiFlexGroup, EuiPanel } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import {
   useWorkspaceForm,
-  WorkspacePermissionSettingPanel,
   WorkspaceUseCase,
   WorkspaceFormErrorCallout,
   SelectDataSourcePanel,
-  usersAndPermissionsCreatePageTitle,
   WorkspaceFormProps,
 } from '../workspace_form';
 
@@ -38,8 +28,6 @@ export const WorkspaceCreatorForm = (props: WorkspaceCreatorFormProps) => {
   const {
     application,
     savedObjects,
-    defaultValues,
-    permissionEnabled,
     dataSourceManagement: isDataSourceEnabled,
     availableUseCases,
   } = props;
@@ -53,13 +41,9 @@ export const WorkspaceCreatorForm = (props: WorkspaceCreatorFormProps) => {
     handleFormSubmit,
     handleColorChange,
     handleUseCaseChange,
-    setPermissionSettings,
     setSelectedDataSourceConnections,
   } = useWorkspaceForm(props);
 
-  const disabledUserOrGroupInputIdsRef = useRef(
-    defaultValues?.permissionSettings?.map((item) => item.id) ?? []
-  );
   const isDashboardAdmin = application?.capabilities?.dashboards?.isDashboardAdmin ?? false;
 
   return (
@@ -112,7 +96,7 @@ export const WorkspaceCreatorForm = (props: WorkspaceCreatorFormProps) => {
                 <EuiText size="xs">
                   {i18n.translate('workspace.creator.form.associateDataSourceDescription', {
                     defaultMessage:
-                      'Add at least one data source that will be available in the workspace. If a selected OpenSearch connection has related Direct Query connections, they will also be available in the workspace.',
+                      'Add at least one data source that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.',
                   })}
                 </EuiText>
                 <SelectDataSourcePanel
@@ -123,50 +107,8 @@ export const WorkspaceCreatorForm = (props: WorkspaceCreatorFormProps) => {
                   showDataSourceManagement={true}
                 />
               </EuiPanel>
-              <EuiSpacer size="s" />
-              <EuiSpacer size="s" />
             </>
           )}
-          {permissionEnabled && (
-            <EuiPanel>
-              <EuiText
-                {...generateRightSidebarScrollProps(RightSidebarScrollField.Collaborators)}
-                size="s"
-              >
-                <h2>{usersAndPermissionsCreatePageTitle}</h2>
-              </EuiText>
-              <EuiText size="xs">
-                {i18n.translate('workspace.creator.form.usersAndPermissionsDescription', {
-                  defaultMessage: 'Manage access and permissions',
-                })}
-              </EuiText>
-              <EuiSpacer size="m" />
-              <EuiDescribedFormGroup
-                title={
-                  <h4 {...generateRightSidebarScrollProps(RightSidebarScrollField.Name)}>
-                    {i18n.translate('workspace.creator.collaborators.panel.fields.name.title', {
-                      defaultMessage: 'Workspace access',
-                    })}
-                  </h4>
-                }
-                description={i18n.translate(
-                  'workspace.creator.collaborators.panel.fields.name.description',
-                  {
-                    defaultMessage:
-                      'You will be added as an owner to the workspace. Select additional users and user groups as workspace collaborators with different access levels.',
-                  }
-                )}
-              >
-                <WorkspacePermissionSettingPanel
-                  errors={formErrors.permissionSettings?.fields}
-                  onChange={setPermissionSettings}
-                  permissionSettings={formData.permissionSettings}
-                  disabledUserOrGroupInputIds={disabledUserOrGroupInputIdsRef.current}
-                  data-test-subj={`workspaceForm-permissionSettingPanel`}
-                />
-              </EuiDescribedFormGroup>
-            </EuiPanel>
-          )}
         </EuiForm>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
@@ -175,7 +117,6 @@ export const WorkspaceCreatorForm = (props: WorkspaceCreatorFormProps) => {
             <WorkspaceFormSummaryPanel
               formData={formData}
               availableUseCases={availableUseCases}
-              permissionEnabled={permissionEnabled}
               formId={formId}
               application={application}
               isSubmitting={props.isSubmitting}
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.test.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.test.tsx
index cac0c18b0287..9f21fdaeba88 100644
--- a/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.test.tsx
@@ -7,10 +7,8 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { WorkspaceFormSummaryPanel, FieldSummaryItem } from './workspace_form_summary_panel';
 import { RightSidebarScrollField } from './utils';
-import { WorkspacePermissionItemType } from '../workspace_form';
 import { applicationServiceMock } from '../../../../../../src/core/public/mocks';
 import { DataSourceConnectionType } from '../../../common/types';
-import { WorkspacePermissionMode } from '../../../common/constants';
 
 describe('WorkspaceFormSummaryPanel', () => {
   const formData = {
@@ -38,25 +36,11 @@ describe('WorkspaceFormSummaryPanel', () => {
         type: '',
         connectionType: DataSourceConnectionType.OpenSearchConnection,
       },
-    ],
-    permissionSettings: [
-      {
-        id: 1,
-        type: WorkspacePermissionItemType.User,
-        userId: 'user1',
-        modes: [WorkspacePermissionMode.LibraryWrite, WorkspacePermissionMode.Write],
-      },
       {
-        id: 2,
-        type: WorkspacePermissionItemType.Group,
-        group: 'group1',
-        modes: [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.Read],
-      },
-      {
-        id: 3,
-        type: WorkspacePermissionItemType.User,
-        userId: 'user2',
-        modes: [WorkspacePermissionMode.LibraryWrite, WorkspacePermissionMode.Read],
+        id: 'data-source-4',
+        name: 'Data Source 4',
+        type: '',
+        connectionType: DataSourceConnectionType.OpenSearchConnection,
       },
     ],
   };
@@ -84,7 +68,6 @@ describe('WorkspaceFormSummaryPanel', () => {
       <WorkspaceFormSummaryPanel
         formData={formData}
         availableUseCases={availableUseCases}
-        permissionEnabled
         formId="id"
         application={applicationMock}
         isSubmitting={false}
@@ -100,12 +83,6 @@ describe('WorkspaceFormSummaryPanel', () => {
     expect(screen.getByText('Data Source 1')).toBeInTheDocument();
     expect(screen.getByText('Data Source 2')).toBeInTheDocument();
     expect(screen.getByText('Data Source 3')).toBeInTheDocument();
-    expect(screen.getByText('user1')).toBeInTheDocument();
-    expect(screen.getByText('Admin')).toBeInTheDocument();
-    expect(screen.getByText('group1')).toBeInTheDocument();
-    expect(screen.getByText('Read only')).toBeInTheDocument();
-    expect(screen.getByText('+1 more')).toBeInTheDocument();
-    expect(screen.queryByText('user2')).toBeNull();
     expect(screen.getByText('Cancel')).toBeInTheDocument();
     expect(screen.getByText('Create workspace')).toBeInTheDocument();
   });
@@ -116,12 +93,10 @@ describe('WorkspaceFormSummaryPanel', () => {
         formData={{
           name: '',
           selectedDataSourceConnections: [],
-          permissionSettings: [],
           features: [],
           useCase: undefined,
         }}
         availableUseCases={availableUseCases}
-        permissionEnabled
         formId="id"
         application={applicationMock}
         isSubmitting={false}
@@ -150,12 +125,6 @@ describe('WorkspaceFormSummaryPanel', () => {
       'workspaceFormRightSideBarSummary-dataSource-Value'
     );
     expect(dataSourcesPlaceholder).toHaveTextContent('—');
-
-    // Permissions placeholder
-    const permissionsPlaceholder = screen.getByTestId(
-      'workspaceFormRightSideBarSummary-collaborators-Value'
-    );
-    expect(permissionsPlaceholder).toHaveTextContent('—');
   });
 
   it('renders all items when expanded and hide some items when click show less', () => {
@@ -163,23 +132,23 @@ describe('WorkspaceFormSummaryPanel', () => {
       <WorkspaceFormSummaryPanel
         formData={formData}
         availableUseCases={availableUseCases}
-        permissionEnabled
         formId="id"
         application={applicationMock}
         isSubmitting={false}
         dataSourceEnabled
       />
     );
-    expect(screen.getByText('user1')).toBeInTheDocument();
-    expect(screen.getByText('group1')).toBeInTheDocument();
-    expect(screen.queryByText('user2')).toBeNull();
+    expect(screen.getByText('Data Source 1')).toBeInTheDocument();
+    expect(screen.getByText('Data Source 2')).toBeInTheDocument();
+    expect(screen.getByText('Data Source 3')).toBeInTheDocument();
+    expect(screen.queryByText('Data Source 4')).toBeNull();
     fireEvent.click(screen.getByText('+1 more'));
 
-    expect(screen.getByText('user2')).toBeInTheDocument();
+    expect(screen.getByText('Data Source 4')).toBeInTheDocument();
     expect(screen.getByText('Show less')).toBeInTheDocument();
 
     fireEvent.click(screen.getByText('Show less'));
-    expect(screen.queryByText('user2')).toBeNull();
+    expect(screen.queryByText('Data Source 4')).toBeNull();
   });
 
   it('should hide "Data sources" if data source not enabled', () => {
@@ -187,7 +156,6 @@ describe('WorkspaceFormSummaryPanel', () => {
       <WorkspaceFormSummaryPanel
         formData={formData}
         availableUseCases={availableUseCases}
-        permissionEnabled
         formId="id"
         application={applicationMock}
         isSubmitting={false}
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.tsx
index fd1647ab87e6..27cbca4e802d 100644
--- a/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.tsx
+++ b/src/plugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.tsx
@@ -22,7 +22,6 @@ import { WorkspaceUseCase } from '../../types';
 import { RightSidebarScrollField, RIGHT_SIDEBAR_SCROLL_KEY } from './utils';
 import { WorkspaceCreateActionPanel } from './workspace_create_action_panel';
 import { WorkspacePermissionMode } from '../../../common/constants';
-import { getPermissionModeName } from '../workspace_form/utils';
 
 const SCROLL_FIELDS = {
   [RightSidebarScrollField.Name]: i18n.translate('workspace.form.summary.panel.name.title', {
@@ -54,11 +53,6 @@ const SCROLL_FIELDS = {
   ),
 };
 
-interface UserAndGroups {
-  key: string;
-  modes: WorkspacePermissionMode[] | undefined;
-}
-
 export const FieldSummaryItem = ({
   field,
   children,
@@ -138,30 +132,9 @@ export const ExpandableTextList = ({
   );
 };
 
-const mapUserAndGroupToList = (userAndGroups: UserAndGroups[]) => {
-  return userAndGroups.map((userAndGroup) => {
-    return (
-      <EuiFlexGroup
-        key={userAndGroup.key}
-        gutterSize="none"
-        justifyContent="spaceBetween"
-        alignItems="center"
-      >
-        <EuiFlexItem grow={false}>{userAndGroup.key}</EuiFlexItem>
-        {userAndGroup.modes && (
-          <EuiFlexItem grow={false}>
-            <em>{getPermissionModeName(userAndGroup.modes)}</em>
-          </EuiFlexItem>
-        )}
-      </EuiFlexGroup>
-    );
-  });
-};
-
 interface WorkspaceFormSummaryPanelProps {
-  formData: WorkspaceFormDataState;
+  formData: Omit<WorkspaceFormDataState, 'permissionSettings'>;
   availableUseCases: WorkspaceUseCase[];
-  permissionEnabled?: boolean;
   formId: string;
   application: ApplicationStart;
   isSubmitting: boolean;
@@ -171,23 +144,12 @@ interface WorkspaceFormSummaryPanelProps {
 export const WorkspaceFormSummaryPanel = ({
   formData,
   availableUseCases,
-  permissionEnabled,
   formId,
   application,
   isSubmitting,
   dataSourceEnabled,
 }: WorkspaceFormSummaryPanelProps) => {
   const useCase = availableUseCases.find((item) => item.id === formData.useCase);
-  const userAndGroups: UserAndGroups[] = formData.permissionSettings.flatMap((setting) => {
-    const modesExist = 'modes' in setting && !!setting.modes;
-    if ('userId' in setting && !!setting.userId && modesExist) {
-      return [{ key: setting.userId, modes: setting.modes }];
-    }
-    if ('group' in setting && !!setting.group && modesExist) {
-      return [{ key: setting.group, modes: setting.modes }];
-    }
-    return [];
-  });
   const useCaseIcon = useCase?.icon || 'logoOpenSearch';
 
   return (
@@ -229,16 +191,6 @@ export const WorkspaceFormSummaryPanel = ({
           )}
         </FieldSummaryItem>
       )}
-      {permissionEnabled && (
-        <FieldSummaryItem bottomGap={false} field={RightSidebarScrollField.Collaborators}>
-          {userAndGroups.length > 0 && (
-            <ExpandableTextList
-              items={mapUserAndGroupToList(userAndGroups)}
-              collapseDisplayCount={2}
-            />
-          )}
-        </FieldSummaryItem>
-      )}
       <WorkspaceCreateActionPanel
         formData={formData}
         formId={formId}
diff --git a/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.test.tsx b/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.test.tsx
index a1bf6502e7b4..9e50258ae9b8 100644
--- a/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.test.tsx
@@ -18,7 +18,7 @@ import { AssociationDataSourceModalMode } from 'src/plugins/workspace/common/con
 
 const setupAssociationDataSourceModal = ({
   mode,
-  assignedConnections,
+  excludedConnectionIds,
   handleAssignDataSourceConnections,
 }: Partial<AssociationDataSourceModalProps> = {}) => {
   const coreServices = coreMock.createStart();
@@ -69,7 +69,7 @@ const setupAssociationDataSourceModal = ({
         notifications={coreServices.notifications}
         savedObjects={coreServices.savedObjects}
         closeModal={jest.fn()}
-        assignedConnections={assignedConnections ?? []}
+        excludedConnectionIds={excludedConnectionIds ?? []}
         handleAssignDataSourceConnections={handleAssignDataSourceConnections ?? jest.fn()}
       />
     </IntlProvider>
@@ -109,10 +109,10 @@ describe('AssociationDataSourceModal', () => {
 
   it('should display opensearch connections', async () => {
     setupAssociationDataSourceModal();
-    expect(screen.getByText('Associate OpenSearch connections')).toBeInTheDocument();
+    expect(screen.getByText('Associate OpenSearch data sources')).toBeInTheDocument();
     expect(
       screen.getByText(
-        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
       )
     ).toBeInTheDocument();
     await waitFor(() => {
@@ -125,7 +125,7 @@ describe('AssociationDataSourceModal', () => {
     setupAssociationDataSourceModal({
       mode: AssociationDataSourceModalMode.DirectQueryConnections,
     });
-    expect(screen.getByText('Associate direct query connections')).toBeInTheDocument();
+    expect(screen.getByText('Associate direct query data sources')).toBeInTheDocument();
     await waitFor(() => {
       expect(screen.queryByRole('option', { name: 'dqc1' })).not.toBeInTheDocument();
       fireEvent.click(screen.getByRole('option', { name: 'Data Source 1' }));
@@ -135,18 +135,11 @@ describe('AssociationDataSourceModal', () => {
 
   it('should hide associated connections', async () => {
     setupAssociationDataSourceModal({
-      assignedConnections: [
-        {
-          id: 'ds2',
-          name: 'Data Source 2',
-          connectionType: DataSourceConnectionType.OpenSearchConnection,
-          type: 'OpenSearch',
-        },
-      ],
+      excludedConnectionIds: ['ds2'],
     });
     expect(
       screen.getByText(
-        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
       )
     ).toBeInTheDocument();
     await waitFor(() => {
diff --git a/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx b/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx
index eacef4f0deb2..ac34e7380ac7 100644
--- a/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx
+++ b/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Fragment, useEffect, useState, useCallback } from 'react';
+import { Fragment, useEffect, useState, useCallback, useRef } from 'react';
 import React from 'react';
 import {
   EuiText,
@@ -129,20 +129,19 @@ const convertConnectionsToOptions = ({
   connections,
   showDirectQueryConnections,
   selectedConnectionIds,
-  assignedConnections,
+  excludedConnectionIds,
   logos,
 }: {
   connections: DataSourceConnection[];
-  assignedConnections: DataSourceConnection[];
+  excludedConnectionIds: string[];
   showDirectQueryConnections: boolean;
   selectedConnectionIds: string[];
   logos: Logos;
 }) => {
-  const assignedConnectionIds = assignedConnections.map(({ id }) => id);
   return connections
     .flatMap((connection) => {
       if (
-        assignedConnectionIds.includes(connection.id) ||
+        excludedConnectionIds.includes(connection.id) ||
         connection.connectionType === DataSourceConnectionType.DirectQueryConnection
       ) {
         return [];
@@ -173,20 +172,28 @@ export interface AssociationDataSourceModalProps {
   http: HttpStart | undefined;
   notifications: NotificationsStart | undefined;
   savedObjects: SavedObjectsStart;
-  assignedConnections: DataSourceConnection[];
+  excludedConnectionIds: string[];
   mode: AssociationDataSourceModalMode;
   closeModal: () => void;
-  handleAssignDataSourceConnections: (connections: DataSourceConnection[]) => void;
+  handleAssignDataSourceConnections: (connections: DataSourceConnection[]) => Promise<void> | void;
   logos: Logos;
 }
 
-export const AssociationDataSourceModal = ({
+export const AssociationDataSourceModal = (props: AssociationDataSourceModalProps) => {
+  return (
+    <EuiModal onClose={props.closeModal} style={{ width: 630 }}>
+      <AssociationDataSourceModalContent {...props} />
+    </EuiModal>
+  );
+};
+
+export const AssociationDataSourceModalContent = ({
   mode,
   http,
   notifications,
   closeModal,
   savedObjects,
-  assignedConnections,
+  excludedConnectionIds,
   handleAssignDataSourceConnections,
   logos,
 }: AssociationDataSourceModalProps) => {
@@ -194,6 +201,15 @@ export const AssociationDataSourceModal = ({
   const [selectedConnectionIds, setSelectedConnectionIds] = useState<string[]>([]);
   const [options, setOptions] = useState<DataSourceModalOption[]>([]);
   const [isLoading, setIsLoading] = useState(false);
+  const [isSaving, setIsSaving] = useState(false);
+  const mountedRef = useRef(false);
+
+  useEffect(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+    };
+  }, []);
 
   const handleSelectionChange = useCallback((newOptions: DataSourceModalOption[]) => {
     setSelectedConnectionIds(
@@ -201,10 +217,15 @@ export const AssociationDataSourceModal = ({
     );
   }, []);
 
-  const handleSaveButtonClick = useCallback(() => {
-    handleAssignDataSourceConnections(
+  const handleSaveButtonClick = useCallback(async () => {
+    setIsSaving(true);
+    const res = handleAssignDataSourceConnections(
       allConnections.filter((connection) => selectedConnectionIds.includes(connection.id))
     );
+    await Promise.resolve(res);
+    if (mountedRef.current) {
+      setIsSaving(false);
+    }
   }, [selectedConnectionIds, allConnections, handleAssignDataSourceConnections]);
 
   useEffect(() => {
@@ -223,27 +244,27 @@ export const AssociationDataSourceModal = ({
     setOptions(
       convertConnectionsToOptions({
         connections: allConnections,
-        assignedConnections,
+        excludedConnectionIds,
         selectedConnectionIds,
         showDirectQueryConnections: mode === AssociationDataSourceModalMode.DirectQueryConnections,
         logos,
       })
     );
-  }, [allConnections, assignedConnections, selectedConnectionIds, mode, logos]);
+  }, [allConnections, excludedConnectionIds, selectedConnectionIds, mode, logos]);
 
   return (
-    <EuiModal onClose={closeModal} style={{ width: 630 }}>
+    <>
       <EuiModalHeader>
         <EuiModalHeaderTitle>
           {mode === AssociationDataSourceModalMode.OpenSearchConnections ? (
             <FormattedMessage
-              id="workspace.detail.dataSources.associateModal.title.openSearchConnections"
-              defaultMessage="Associate OpenSearch connections"
+              id="workspace.detail.dataSources.associateModal.title.openSearchDataSources"
+              defaultMessage="Associate OpenSearch data sources"
             />
           ) : (
             <FormattedMessage
-              id="workspace.detail.dataSources.associateModal.title.directQueryConnections"
-              defaultMessage="Associate direct query connections"
+              id="workspace.detail.dataSources.associateModal.title.directQueryDataSources"
+              defaultMessage="Associate direct query data sources"
             />
           )}
         </EuiModalHeaderTitle>
@@ -252,7 +273,7 @@ export const AssociationDataSourceModal = ({
         <EuiText size="xs" color="subdued">
           <FormattedMessage
             id="workspace.detail.dataSources.associateModal.message"
-            defaultMessage="Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace."
+            defaultMessage="Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace."
           />
         </EuiText>
         <EuiSpacer size="s" />
@@ -292,6 +313,7 @@ export const AssociationDataSourceModal = ({
           data-test-subj="workspace-detail-dataSources-associateModal-save-button"
           onClick={handleSaveButtonClick}
           isDisabled={selectedConnectionIds.length === 0}
+          isLoading={isSaving}
           fill
         >
           <FormattedMessage
@@ -300,6 +322,6 @@ export const AssociationDataSourceModal = ({
           />
         </EuiSmallButton>
       </EuiModalFooter>
-    </EuiModal>
+    </>
   );
 };
diff --git a/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.test.tsx b/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.test.tsx
index ad27f6915349..637204598587 100644
--- a/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.test.tsx
@@ -228,7 +228,7 @@ describe('SelectDataSourceDetailPanel', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
       expect(getByText('Data Source 2')).toBeInTheDocument();
@@ -272,7 +272,7 @@ describe('SelectDataSourceDetailPanel', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
       expect(getByText('Data Source 2')).toBeInTheDocument();
@@ -311,14 +311,14 @@ describe('SelectDataSourceDetailPanel', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
     });
     fireEvent.click(getByText('Close'));
     expect(
       queryByText(
-        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
       )
     ).toBeNull();
   });
diff --git a/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.tsx b/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.tsx
index 3bb4f612d3a3..e72f285f636d 100644
--- a/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.tsx
+++ b/src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useMemo } from 'react';
 import {
   EuiText,
   EuiTitle,
@@ -281,6 +281,10 @@ export const SelectDataSourceDetailPanel = ({
     setIsLoading(loading);
   }, [loading]);
 
+  const excludedConnectionIds = useMemo(() => {
+    return formData.selectedDataSourceConnections.map((c) => c.id);
+  }, [formData.selectedDataSourceConnections]);
+
   return (
     <EuiPanel>
       <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
@@ -312,7 +316,7 @@ export const SelectDataSourceDetailPanel = ({
           notifications={notifications}
           savedObjects={savedObjects}
           closeModal={() => setIsVisible(false)}
-          assignedConnections={formData.selectedDataSourceConnections}
+          excludedConnectionIds={excludedConnectionIds}
           handleAssignDataSourceConnections={handleAssignDataSourceConnections}
           mode={toggleIdSelected as AssociationDataSourceModalMode}
           logos={chrome.logos}
diff --git a/src/plugins/workspace/public/components/workspace_detail/workspace_detail.tsx b/src/plugins/workspace/public/components/workspace_detail/workspace_detail.tsx
index e027c7d5f586..627ecb4d0271 100644
--- a/src/plugins/workspace/public/components/workspace_detail/workspace_detail.tsx
+++ b/src/plugins/workspace/public/components/workspace_detail/workspace_detail.tsx
@@ -138,7 +138,7 @@ export const WorkspaceDetail = (props: WorkspaceDetailPropsWithFormSubmitting) =
   // When user has unsaved changes and navigates to other page, will show a confirm modal.
   useEffect(() => {
     onAppLeave((actions) => {
-      if (!props.isFormSubmitting && isEditing && numberOfChanges > 0) {
+      if (isEditing && numberOfChanges > 0) {
         return actions.confirm(
           i18n.translate('workspace.detail.navigate.message', {
             defaultMessage: 'Any unsaved changes will be lost.',
@@ -151,7 +151,7 @@ export const WorkspaceDetail = (props: WorkspaceDetailPropsWithFormSubmitting) =
       }
       return actions.default();
     });
-  }, [handleResetForm, isEditing, numberOfChanges, onAppLeave, props.isFormSubmitting]);
+  }, [handleResetForm, isEditing, numberOfChanges, onAppLeave]);
 
   const handleSetDefaultWorkspace = useCallback(
     async (workspace: WorkspaceAttribute) => {
diff --git a/src/plugins/workspace/public/components/workspace_detail_app.tsx b/src/plugins/workspace/public/components/workspace_detail_app.tsx
index b67d0eef6544..2ece6e4e73bb 100644
--- a/src/plugins/workspace/public/components/workspace_detail_app.tsx
+++ b/src/plugins/workspace/public/components/workspace_detail_app.tsx
@@ -92,7 +92,7 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
   }, [currentWorkspace, savedObjects, http, notifications]);
 
   const handleWorkspaceFormSubmit = useCallback(
-    async (data: WorkspaceFormSubmitData, refresh?: boolean) => {
+    async (data: WorkspaceFormSubmitData) => {
       let result;
       if (isFormSubmitting) {
         return;
@@ -121,28 +121,15 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
           dataSources: selectedDataSourceIds,
           permissions: convertPermissionSettingsToPermissions(permissionSettings),
         });
+        setIsFormSubmitting(false);
         if (result?.success) {
           notifications?.toasts.addSuccess({
             title: i18n.translate('workspace.update.success', {
               defaultMessage: 'Update workspace successfully',
             }),
           });
-          setIsFormSubmitting(false);
-          if (application && http && refresh) {
-            // Redirect page after one second, leave one second time to show update successful toast.
-            window.setTimeout(() => {
-              window.location.href = formatUrlWithWorkspaceId(
-                application.getUrlForApp(WORKSPACE_DETAIL_APP_ID, {
-                  absolute: true,
-                }),
-                currentWorkspace.id,
-                http.basePath
-              );
-            }, 1000);
-          }
           return result;
         } else {
-          setIsFormSubmitting(false);
           throw new Error(result?.error ? result?.error : 'update workspace failed');
         }
       } catch (error) {
@@ -156,7 +143,7 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
         return;
       }
     },
-    [isFormSubmitting, currentWorkspace, notifications?.toasts, workspaceClient, application, http]
+    [isFormSubmitting, currentWorkspace, notifications?.toasts, workspaceClient]
   );
 
   if (!workspaces || !application || !http || !savedObjects || !currentWorkspaceFormData) {
diff --git a/src/plugins/workspace/public/components/workspace_form/__snapshots__/workspace_collaborator_table.test.tsx.snap b/src/plugins/workspace/public/components/workspace_form/__snapshots__/workspace_collaborator_table.test.tsx.snap
index caaa8456ecdb..2e83a4ebe437 100644
--- a/src/plugins/workspace/public/components/workspace_form/__snapshots__/workspace_collaborator_table.test.tsx.snap
+++ b/src/plugins/workspace/public/components/workspace_form/__snapshots__/workspace_collaborator_table.test.tsx.snap
@@ -316,13 +316,9 @@ Object {
                       Type
                     </div>
                     <div
-                      class="euiTableCellContent"
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
                     >
-                      <span
-                        class="euiTableCellContent__text"
-                      >
-                        User
-                      </span>
+                      User
                     </div>
                   </td>
                   <td
@@ -334,13 +330,9 @@ Object {
                       Access level
                     </div>
                     <div
-                      class="euiTableCellContent"
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
                     >
-                      <span
-                        class="euiTableCellContent__text"
-                      >
-                        Admin
-                      </span>
+                      Admin
                     </div>
                   </td>
                   <td
@@ -430,14 +422,85 @@ Object {
                     >
                       Type
                     </div>
+                    <div
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
+                    >
+                      Group
+                    </div>
+                  </td>
+                  <td
+                    class="euiTableRowCell"
+                  >
+                    <div
+                      class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                    >
+                      Access level
+                    </div>
+                    <div
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
+                    >
+                      Read only
+                    </div>
+                  </td>
+                  <td
+                    class="euiTableRowCell"
+                  >
+                    <div
+                      class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                    >
+                      Actions
+                    </div>
+                    <div
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
+                    >
+                      <div
+                        class="euiPopover euiPopover--anchorDownLeft"
+                        id="workspace-detail-add-collaborator-action"
+                      >
+                        <div
+                          class="euiPopover__anchor"
+                        >
+                          <button
+                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                            data-test-subj="workspace-detail-collaborator-table-actions-box"
+                            type="button"
+                          >
+                            <span
+                              aria-hidden="true"
+                              class="euiButtonIcon__icon"
+                              color="inherit"
+                              data-euiicon-type="boxesHorizontal"
+                            />
+                          </button>
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+                <tr
+                  class="euiTableRow euiTableRow-isSelectable"
+                >
+                  <td
+                    class="euiTableRowCellCheckbox"
+                  >
                     <div
                       class="euiTableCellContent"
                     >
-                      <span
-                        class="euiTableCellContent__text"
+                      <div
+                        class="euiCheckbox euiCheckbox--inList euiCheckbox--noLabel"
                       >
-                        Group
-                      </span>
+                        <input
+                          aria-label="Select this row"
+                          class="euiCheckbox__input"
+                          data-test-subj="checkboxSelectRow-2"
+                          id="_selection_column_2-checkbox"
+                          title="Select this row"
+                          type="checkbox"
+                        />
+                        <div
+                          class="euiCheckbox__square"
+                        />
+                      </div>
                     </div>
                   </td>
                   <td
@@ -446,16 +509,42 @@ Object {
                     <div
                       class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
                     >
-                      Access level
+                      ID
                     </div>
                     <div
                       class="euiTableCellContent"
                     >
                       <span
                         class="euiTableCellContent__text"
-                      >
-                        Read only
-                      </span>
+                      />
+                    </div>
+                  </td>
+                  <td
+                    class="euiTableRowCell"
+                  >
+                    <div
+                      class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                    >
+                      Type
+                    </div>
+                    <div
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
+                    >
+                      —
+                    </div>
+                  </td>
+                  <td
+                    class="euiTableRowCell"
+                  >
+                    <div
+                      class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                    >
+                      Access level
+                    </div>
+                    <div
+                      class="euiTableCellContent euiTableCellContent--overflowingContent"
+                    >
+                      —
                     </div>
                   </td>
                   <td
@@ -918,13 +1007,9 @@ Object {
                     Type
                   </div>
                   <div
-                    class="euiTableCellContent"
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
                   >
-                    <span
-                      class="euiTableCellContent__text"
-                    >
-                      User
-                    </span>
+                    User
                   </div>
                 </td>
                 <td
@@ -936,13 +1021,9 @@ Object {
                     Access level
                   </div>
                   <div
-                    class="euiTableCellContent"
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
                   >
-                    <span
-                      class="euiTableCellContent__text"
-                    >
-                      Admin
-                    </span>
+                    Admin
                   </div>
                 </td>
                 <td
@@ -1032,14 +1113,85 @@ Object {
                   >
                     Type
                   </div>
+                  <div
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
+                  >
+                    Group
+                  </div>
+                </td>
+                <td
+                  class="euiTableRowCell"
+                >
+                  <div
+                    class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                  >
+                    Access level
+                  </div>
+                  <div
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
+                  >
+                    Read only
+                  </div>
+                </td>
+                <td
+                  class="euiTableRowCell"
+                >
+                  <div
+                    class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                  >
+                    Actions
+                  </div>
+                  <div
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
+                  >
+                    <div
+                      class="euiPopover euiPopover--anchorDownLeft"
+                      id="workspace-detail-add-collaborator-action"
+                    >
+                      <div
+                        class="euiPopover__anchor"
+                      >
+                        <button
+                          class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                          data-test-subj="workspace-detail-collaborator-table-actions-box"
+                          type="button"
+                        >
+                          <span
+                            aria-hidden="true"
+                            class="euiButtonIcon__icon"
+                            color="inherit"
+                            data-euiicon-type="boxesHorizontal"
+                          />
+                        </button>
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+              <tr
+                class="euiTableRow euiTableRow-isSelectable"
+              >
+                <td
+                  class="euiTableRowCellCheckbox"
+                >
                   <div
                     class="euiTableCellContent"
                   >
-                    <span
-                      class="euiTableCellContent__text"
+                    <div
+                      class="euiCheckbox euiCheckbox--inList euiCheckbox--noLabel"
                     >
-                      Group
-                    </span>
+                      <input
+                        aria-label="Select this row"
+                        class="euiCheckbox__input"
+                        data-test-subj="checkboxSelectRow-2"
+                        id="_selection_column_2-checkbox"
+                        title="Select this row"
+                        type="checkbox"
+                      />
+                      <div
+                        class="euiCheckbox__square"
+                      />
+                    </div>
                   </div>
                 </td>
                 <td
@@ -1048,16 +1200,42 @@ Object {
                   <div
                     class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
                   >
-                    Access level
+                    ID
                   </div>
                   <div
                     class="euiTableCellContent"
                   >
                     <span
                       class="euiTableCellContent__text"
-                    >
-                      Read only
-                    </span>
+                    />
+                  </div>
+                </td>
+                <td
+                  class="euiTableRowCell"
+                >
+                  <div
+                    class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                  >
+                    Type
+                  </div>
+                  <div
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
+                  >
+                    —
+                  </div>
+                </td>
+                <td
+                  class="euiTableRowCell"
+                >
+                  <div
+                    class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+                  >
+                    Access level
+                  </div>
+                  <div
+                    class="euiTableCellContent euiTableCellContent--overflowingContent"
+                  >
+                    —
                   </div>
                 </td>
                 <td
diff --git a/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.test.tsx b/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.test.tsx
index f5466a1f0996..82d4bae43c66 100644
--- a/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.test.tsx
@@ -7,6 +7,8 @@ import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
 
 import { AddCollaboratorButton } from './add_collaborator_button';
+import { WorkspacePermissionSetting } from './types';
+import { DuplicateCollaboratorError } from '../add_collaborators_modal';
 
 describe('AddCollaboratorButton', () => {
   const mockProps = {
@@ -24,7 +26,7 @@ describe('AddCollaboratorButton', () => {
         type: 'group',
         group: 'group',
       },
-    ],
+    ] as WorkspacePermissionSetting[],
     handleSubmitPermissionSettings: jest.fn(),
   };
 
@@ -105,4 +107,65 @@ describe('AddCollaboratorButton', () => {
       { id: 2, modes: ['library_read', 'read'], type: 'user', userId: '2' },
     ]);
   });
+
+  it('should throw DuplicateCollaboratorError with consistent details', async () => {
+    let errorCached: DuplicateCollaboratorError | undefined;
+    const mockOnAdd = jest.fn(async ({ onAddCollaborators }) => {
+      try {
+        await onAddCollaborators([
+          {
+            accessLevel: 'readOnly',
+            collaboratorId: 'admin',
+            permissionType: 'user',
+          },
+          {
+            accessLevel: 'readOnly',
+            collaboratorId: 'group',
+            permissionType: 'group',
+          },
+          {
+            accessLevel: 'readOnly',
+            collaboratorId: 'new-user',
+            permissionType: 'user',
+          },
+          {
+            accessLevel: 'readOnly',
+            collaboratorId: 'new-user',
+            permissionType: 'user',
+          },
+        ]);
+      } catch (e) {
+        errorCached = e;
+      }
+    });
+    const displayedTypes = [
+      {
+        name: 'add user',
+        buttonLabel: 'add user',
+        onAdd: mockOnAdd,
+        id: 'user',
+      },
+      {
+        name: 'add group',
+        buttonLabel: 'add group',
+        onAdd: mockOnAdd,
+        id: 'group',
+      },
+    ];
+    const { getByTestId, getByText } = render(
+      <AddCollaboratorButton {...mockProps} displayedTypes={displayedTypes} />
+    );
+    const button = getByTestId('add-collaborator-button');
+    fireEvent.click(button);
+    expect(getByTestId('add-collaborator-popover')).toBeInTheDocument();
+    const addUserButton = getByText('add user');
+    fireEvent.click(addUserButton);
+    await mockOnAdd.mock.results;
+
+    expect(errorCached).toBeInstanceOf(DuplicateCollaboratorError);
+    if (errorCached instanceof DuplicateCollaboratorError) {
+      expect(errorCached.details.pendingAdded).toEqual(['new-user']);
+      expect(errorCached.details.existing).toEqual(['admin', 'group']);
+    }
+  });
 });
diff --git a/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.tsx b/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.tsx
index c7360d173e02..8cbf34cbccfe 100644
--- a/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/add_collaborator_button.tsx
@@ -15,15 +15,18 @@ import { i18n } from '@osd/i18n';
 import { WorkspaceCollaboratorType } from '../../services/workspace_collaborator_types_service';
 import { WorkspaceCollaborator } from '../../types';
 import { PermissionSetting } from './workspace_collaborator_table';
-import { generateNextPermissionSettingsId } from './utils';
+import { generateNextPermissionSettingsId, hasSameUserIdOrGroup } from './utils';
 import { accessLevelNameToWorkspacePermissionModesMap } from '../../constants';
 import { WorkspacePermissionItemType } from './constants';
 import { WorkspacePermissionSetting } from './types';
+import { DuplicateCollaboratorError } from '../add_collaborators_modal';
 
 interface Props {
   displayedTypes: WorkspaceCollaboratorType[];
   permissionSettings: PermissionSetting[];
-  handleSubmitPermissionSettings: (permissionSettings: WorkspacePermissionSetting[]) => void;
+  handleSubmitPermissionSettings: (
+    permissionSettings: WorkspacePermissionSetting[]
+  ) => Promise<void>;
 }
 
 export const AddCollaboratorButton = ({
@@ -42,8 +45,9 @@ export const AddCollaboratorButton = ({
   }, []);
 
   const onAddCollaborators = async (collaborators: WorkspaceCollaborator[]) => {
+    const uniqueCollaboratorIds = new Set();
     const addedSettings = collaborators.map(({ permissionType, accessLevel, collaboratorId }) => ({
-      type: permissionType as WorkspacePermissionItemType,
+      type: permissionType,
       modes: accessLevelNameToWorkspacePermissionModesMap[accessLevel],
       id: nextIdGenerator(),
       ...(permissionType === WorkspacePermissionItemType.User
@@ -53,9 +57,35 @@ export const AddCollaboratorButton = ({
         : {
             group: collaboratorId,
           }),
-    }));
-    const newPermissionSettings = [...permissionSettings, ...addedSettings];
-    handleSubmitPermissionSettings(newPermissionSettings as WorkspacePermissionSetting[]);
+      collaboratorId,
+    })) as Array<WorkspacePermissionSetting & { collaboratorId: string }>;
+    const existingDuplicateSettings = addedSettings.filter((permissionSettingToAdd) =>
+      hasSameUserIdOrGroup(permissionSettings, permissionSettingToAdd)
+    );
+    const pendingAddedDuplicateCollaboratorIds = Array.from(
+      new Set(
+        collaborators.flatMap(({ collaboratorId }) => {
+          if (uniqueCollaboratorIds.has(collaboratorId)) {
+            return [collaboratorId];
+          }
+          uniqueCollaboratorIds.add(collaboratorId);
+          return [];
+        })
+      )
+    );
+    if (pendingAddedDuplicateCollaboratorIds.length > 0 || existingDuplicateSettings.length > 0) {
+      throw new DuplicateCollaboratorError({
+        pendingAdded: pendingAddedDuplicateCollaboratorIds,
+        existing: Array.from(
+          new Set(existingDuplicateSettings.map((setting) => setting.collaboratorId))
+        ),
+      });
+    }
+    const newPermissionSettings = [
+      ...permissionSettings,
+      ...addedSettings.map(({ collaboratorId, ...rest }) => rest),
+    ];
+    await handleSubmitPermissionSettings(newPermissionSettings as WorkspacePermissionSetting[]);
   };
 
   const panelItems = displayedTypes.map(({ id, buttonLabel, onAdd }) => ({
diff --git a/src/plugins/workspace/public/components/workspace_form/index.ts b/src/plugins/workspace/public/components/workspace_form/index.ts
index fef18d7c8c5e..48f1aec5e504 100644
--- a/src/plugins/workspace/public/components/workspace_form/index.ts
+++ b/src/plugins/workspace/public/components/workspace_form/index.ts
@@ -14,7 +14,12 @@ export { ConnectionTypeIcon } from './connection_type_icon';
 export { DataSourceConnectionTable } from './data_source_connection_table';
 export { WorkspaceUseCaseFlyout } from './workspace_use_case_flyout';
 
-export { WorkspaceFormSubmitData, WorkspaceFormProps, WorkspaceFormDataState } from './types';
+export {
+  WorkspaceFormSubmitData,
+  WorkspaceFormProps,
+  WorkspaceFormDataState,
+  WorkspacePermissionSetting,
+} from './types';
 export {
   WorkspaceOperationType,
   DetailTab,
diff --git a/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.test.tsx b/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.test.tsx
index 6ec5c23a1b87..c648a5203438 100644
--- a/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.test.tsx
@@ -155,7 +155,7 @@ describe('SelectDataSourcePanel', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
       expect(getByText(assignedDataSourcesConnections[1].name)).toBeInTheDocument();
@@ -218,14 +218,14 @@ describe('SelectDataSourcePanel', () => {
     await waitFor(() => {
       expect(
         getByText(
-          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+          'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
         )
       ).toBeInTheDocument();
     });
     fireEvent.click(getByText('Close'));
     expect(
       queryByText(
-        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query connection, they will also be available in the workspace.'
+        'Add data sources that will be available in the workspace. If a selected data source has related Direct Query data sources, they will also be available in the workspace.'
       )
     ).toBeNull();
   });
diff --git a/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.tsx b/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.tsx
index 5a769110a9b4..3d0d804d33fc 100644
--- a/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/select_data_source_panel.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import {
   EuiSpacer,
   EuiFlexItem,
@@ -46,6 +46,10 @@ export const SelectDataSourcePanel = ({
     services: { notifications, http, chrome },
   } = useOpenSearchDashboards<{ CoreStart: CoreStart; workspaceClient: WorkspaceClient }>();
 
+  const excludedConnectionIds = useMemo(() => assignedDataSourceConnections.map((c) => c.id), [
+    assignedDataSourceConnections,
+  ]);
+
   const handleAssignDataSourceConnections = (newDataSourceConnections: DataSourceConnection[]) => {
     setModalVisible(false);
     onChange([...assignedDataSourceConnections, ...newDataSourceConnections]);
@@ -75,7 +79,7 @@ export const SelectDataSourcePanel = ({
       data-test-subj={testingId}
     >
       {i18n.translate('workspace.form.selectDataSourcePanel.addNew', {
-        defaultMessage: 'Associate OpenSearch connections',
+        defaultMessage: 'Associate OpenSearch data sources',
       })}
     </EuiSmallButton>
   );
@@ -92,7 +96,7 @@ export const SelectDataSourcePanel = ({
       data-test-subj={testingId}
     >
       {i18n.translate('workspace.form.selectDataSourcePanel.addNewDQCs', {
-        defaultMessage: 'Associate direct query connections',
+        defaultMessage: 'Associate direct query data sources',
       })}
     </EuiSmallButton>
   );
@@ -187,7 +191,7 @@ export const SelectDataSourcePanel = ({
       {modalVisible && chrome && (
         <AssociationDataSourceModal
           savedObjects={savedObjects}
-          assignedConnections={assignedDataSourceConnections}
+          excludedConnectionIds={excludedConnectionIds}
           closeModal={() => setModalVisible(false)}
           handleAssignDataSourceConnections={handleAssignDataSourceConnections}
           http={http}
diff --git a/src/plugins/workspace/public/components/workspace_form/use_workspace_form.test.ts b/src/plugins/workspace/public/components/workspace_form/use_workspace_form.test.ts
index ecb36acaa125..19b9299c52dc 100644
--- a/src/plugins/workspace/public/components/workspace_form/use_workspace_form.test.ts
+++ b/src/plugins/workspace/public/components/workspace_form/use_workspace_form.test.ts
@@ -138,8 +138,7 @@ describe('useWorkspaceForm', () => {
       expect.objectContaining({
         name: 'test-workspace-name',
         features: ['use-case-observability'],
-      }),
-      true
+      })
     );
   });
   it('should update selected use case', () => {
diff --git a/src/plugins/workspace/public/components/workspace_form/use_workspace_form.ts b/src/plugins/workspace/public/components/workspace_form/use_workspace_form.ts
index 35be869c701a..d9e4a24f3399 100644
--- a/src/plugins/workspace/public/components/workspace_form/use_workspace_form.ts
+++ b/src/plugins/workspace/public/components/workspace_form/use_workspace_form.ts
@@ -16,12 +16,7 @@ import {
   WorkspacePermissionSetting,
   WorkspaceFormDataState,
 } from './types';
-import {
-  generatePermissionSettingsState,
-  getNumberOfChanges,
-  getNumberOfErrors,
-  validateWorkspaceForm,
-} from './utils';
+import { getNumberOfChanges, getNumberOfErrors, validateWorkspaceForm } from './utils';
 import { WorkspacePermissionItemType } from './constants';
 
 const workspaceHtmlIdGenerator = htmlIdGenerator();
@@ -29,7 +24,6 @@ const workspaceHtmlIdGenerator = htmlIdGenerator();
 export const useWorkspaceForm = ({
   application,
   defaultValues,
-  operationType,
   onSubmit,
   permissionEnabled,
   onAppLeave,
@@ -40,9 +34,6 @@ export const useWorkspaceForm = ({
   const [color, setColor] = useState(defaultValues?.color);
   const defaultValuesRef = useRef(defaultValues);
   const [isEditing, setIsEditing] = useState(false);
-  const initialPermissionSettingsRef = useRef(
-    generatePermissionSettingsState(operationType, defaultValues?.permissionSettings)
-  );
 
   const [featureConfigs, setFeatureConfigs] = useState<string[]>(defaultValues?.features ?? []);
   const selectedUseCase = useMemo(() => getFirstUseCaseOfFeatureConfigs(featureConfigs), [
@@ -50,7 +41,7 @@ export const useWorkspaceForm = ({
   ]);
   const [permissionSettings, setPermissionSettings] = useState<
     WorkspaceFormDataState['permissionSettings']
-  >(initialPermissionSettingsRef.current);
+  >(defaultValues?.permissionSettings ?? []);
 
   const [selectedDataSourceConnections, setSelectedDataSourceConnections] = useState<
     DataSourceConnection[]
@@ -77,11 +68,7 @@ export const useWorkspaceForm = ({
   getFormDataRef.current = getFormData;
   const formData = getFormData();
   const numberOfChanges = defaultValuesRef.current
-    ? getNumberOfChanges(formData, {
-        ...defaultValuesRef.current,
-        // The user form will insert some empty permission rows, should ignore these rows not treated as user new added.
-        permissionSettings: initialPermissionSettingsRef.current,
-      })
+    ? getNumberOfChanges(formData, defaultValuesRef.current)
     : 0;
 
   if (!formIdRef.current) {
@@ -102,8 +89,19 @@ export const useWorkspaceForm = ({
     [setFeatureConfigs]
   );
 
+  const getSubmitFormData = (submitFormData: WorkspaceFormDataState) => {
+    return {
+      name: submitFormData.name!,
+      description: submitFormData.description,
+      color: submitFormData.color || '#FFFFFF',
+      features: submitFormData.features,
+      permissionSettings: submitFormData.permissionSettings as WorkspacePermissionSetting[],
+      selectedDataSourceConnections: submitFormData.selectedDataSourceConnections,
+    };
+  };
+
   const handleFormSubmit = useCallback<FormEventHandler>(
-    (e) => {
+    async (e) => {
       e.preventDefault();
       const currentFormData = getFormDataRef.current();
       currentFormData.permissionSettings = currentFormData.permissionSettings.filter(
@@ -120,34 +118,22 @@ export const useWorkspaceForm = ({
         return;
       }
 
-      onSubmit?.(
-        {
-          name: currentFormData.name!,
-          description: currentFormData.description,
-          color: currentFormData.color || '#FFFFFF',
-          features: currentFormData.features,
-          permissionSettings: currentFormData.permissionSettings as WorkspacePermissionSetting[],
-          selectedDataSourceConnections: currentFormData.selectedDataSourceConnections,
-        },
-        true
-      );
+      const submitFormData = getSubmitFormData(currentFormData);
+      const result = await onSubmit?.(submitFormData);
+      if (result?.success) {
+        defaultValuesRef.current = submitFormData;
+        setIsEditing(false);
+      }
     },
     [onSubmit, permissionEnabled]
   );
 
   const handleSubmitPermissionSettings = async (settings: WorkspacePermissionSetting[]) => {
     const currentFormData = getFormDataRef.current();
-    const result = await onSubmit?.(
-      {
-        name: currentFormData.name!,
-        description: currentFormData.description,
-        color: currentFormData.color || '#FFFFFF',
-        features: currentFormData.features,
-        permissionSettings: settings,
-        selectedDataSourceConnections: currentFormData.selectedDataSourceConnections,
-      },
-      false
-    );
+    const result = await onSubmit?.({
+      ...getSubmitFormData(currentFormData),
+      permissionSettings: settings,
+    });
     if (result) {
       setPermissionSettings(settings);
     }
@@ -163,7 +149,6 @@ export const useWorkspaceForm = ({
     setDescription(resetValues?.description ?? '');
     setColor(resetValues?.color);
     setFeatureConfigs(resetValues?.features ?? []);
-    setPermissionSettings(initialPermissionSettingsRef.current);
     setFormErrors({});
     setIsEditing(false);
   }, []);
diff --git a/src/plugins/workspace/public/components/workspace_form/utils.test.ts b/src/plugins/workspace/public/components/workspace_form/utils.test.ts
index e387393c4a31..6c480a70f714 100644
--- a/src/plugins/workspace/public/components/workspace_form/utils.test.ts
+++ b/src/plugins/workspace/public/components/workspace_form/utils.test.ts
@@ -553,79 +553,6 @@ describe('getNumberOfChanges', () => {
       )
     ).toEqual(1);
   });
-  it('should return consistent permission settings changes count', () => {
-    expect(
-      getNumberOfChanges(
-        {
-          name: 'foo',
-          permissionSettings: [
-            {
-              id: 0,
-              type: WorkspacePermissionItemType.User,
-              userId: 'user-1',
-              modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
-            },
-          ],
-        },
-        {
-          name: 'foo',
-          permissionSettings: [
-            {
-              id: 0,
-              type: WorkspacePermissionItemType.User,
-              userId: 'user-1',
-              modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
-            },
-          ],
-        }
-      )
-    ).toEqual(0);
-    // for remove permission setting
-    expect(
-      getNumberOfChanges(
-        {
-          name: 'foo',
-          permissionSettings: [
-            {
-              id: 0,
-              type: WorkspacePermissionItemType.User,
-              userId: 'user-1',
-              modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
-            },
-            {
-              id: 1,
-              type: WorkspacePermissionItemType.Group,
-              group: 'group-1',
-              modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
-            },
-          ],
-        },
-        {
-          name: 'foo',
-          /**
-           * These include three changes:
-           * 1.Remove permission setting#0
-           * 2.Modify permission setting#1
-           * 3.Add permission setting#2
-           */
-          permissionSettings: [
-            {
-              id: 1,
-              type: WorkspacePermissionItemType.Group,
-              group: 'group-1',
-              modes: [WorkspacePermissionMode.Read, WorkspacePermissionMode.LibraryWrite],
-            },
-            {
-              id: 2,
-              type: WorkspacePermissionItemType.User,
-              userId: 'user-1',
-              modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
-            },
-          ],
-        }
-      )
-    ).toEqual(3);
-  });
 });
 
 describe('isWorkspacePermissionSetting', () => {
diff --git a/src/plugins/workspace/public/components/workspace_form/utils.ts b/src/plugins/workspace/public/components/workspace_form/utils.ts
index a1fdb319e1aa..0bdb861a55bc 100644
--- a/src/plugins/workspace/public/components/workspace_form/utils.ts
+++ b/src/plugins/workspace/public/components/workspace_form/utils.ts
@@ -6,12 +6,11 @@
 import { i18n } from '@osd/i18n';
 
 import type { SavedObjectPermissions } from '../../../../../core/types';
-import { CURRENT_USER_PLACEHOLDER, WorkspacePermissionMode } from '../../../common/constants';
+import { WorkspacePermissionMode } from '../../../common/constants';
 import { isUseCaseFeatureConfig } from '../../utils';
 import {
   optionIdToWorkspacePermissionModesMap,
   permissionModeOptions,
-  WorkspaceOperationType,
   WorkspacePermissionItemType,
 } from './constants';
 
@@ -85,7 +84,7 @@ export const hasSameUserIdOrGroup = (
 export const getPermissionModeId = (modes: WorkspacePermissionMode[]) => {
   for (const key in optionIdToWorkspacePermissionModesMap) {
     if (optionIdToWorkspacePermissionModesMap[key].every((mode) => modes?.includes(mode))) {
-      return key;
+      return key as PermissionModeId;
     }
   }
   return PermissionModeId.Read;
@@ -382,49 +381,6 @@ export const generateNextPermissionSettingsId = (permissionSettings: Array<{ id:
     : Math.max(...permissionSettings.map(({ id }) => id)) + 1;
 };
 
-/**
- *
- * Generate permission settings state with provided operation type and  permission settings,
- * It will always return current user as an Owner and an empty user group permission settings
- * when operation type is create or no users and groups in provided permission settings.
- * It will append current user to result permission settings if no user in provided permission settings.
- * It will append an empty permission group to result permission settings if no user group in provided permission settings.
- * It will always return original permission settings if both user or user group in provided permission settings.
- *
- * @param operationType
- * @param permissionSettings
- * @returns
- */
-export const generatePermissionSettingsState = (
-  operationType: WorkspaceOperationType,
-  permissionSettings?: WorkspacePermissionSetting[]
-): WorkspacePermissionSetting[] => {
-  const emptyUserPermission: WorkspaceUserPermissionSetting = {
-    id: 1,
-    type: WorkspacePermissionItemType.User,
-    userId: '',
-    modes: optionIdToWorkspacePermissionModesMap[PermissionModeId.Owner],
-  };
-  const emptyUserGroupPermission: WorkspaceUserGroupPermissionSetting = {
-    id: 2,
-    type: WorkspacePermissionItemType.Group,
-    group: '',
-    modes: optionIdToWorkspacePermissionModesMap[PermissionModeId.Read],
-  };
-
-  if (operationType === WorkspaceOperationType.Create) {
-    return [
-      {
-        ...emptyUserPermission,
-        userId: CURRENT_USER_PLACEHOLDER,
-      },
-      emptyUserGroupPermission,
-    ];
-  }
-
-  return [...(permissionSettings ?? [])];
-};
-
 interface PermissionSettingLike
   extends Omit<Partial<WorkspaceUserPermissionSetting>, 'type'>,
     Omit<Partial<WorkspaceUserGroupPermissionSetting>, 'type'> {
@@ -490,25 +446,5 @@ export const getNumberOfChanges = (
   ) {
     count++;
   }
-  // Count all new added permission settings
-  count +=
-    newFormData.permissionSettings?.reduce((prevNewAddedCount, setting) => {
-      if (!initialFormData.permissionSettings?.find((item) => item.id === setting.id)) {
-        prevNewAddedCount += 1;
-      }
-      return prevNewAddedCount;
-    }, 0) ?? 0;
-  count +=
-    initialFormData.permissionSettings?.reduce((prevDeletedAndModifiedCount, setting) => {
-      const newSetting = newFormData.permissionSettings?.find((item) => item.id === setting.id);
-      if (!newSetting) {
-        // Count all delete permission settings
-        prevDeletedAndModifiedCount += 1;
-      } else if (!isSamePermissionSetting(newSetting, setting)) {
-        // Count all modified permission settings
-        prevDeletedAndModifiedCount += 1;
-      }
-      return prevDeletedAndModifiedCount;
-    }, 0) ?? 0;
   return count;
 };
diff --git a/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.test.tsx b/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.test.tsx
index 1b4e514e62c8..d823fe477474 100644
--- a/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.test.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.test.tsx
@@ -6,11 +6,27 @@
 import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
 
-import { WorkspaceCollaboratorTable } from './workspace_collaborator_table';
+import { WorkspaceCollaboratorTable, getDisplayedType } from './workspace_collaborator_table';
 import { createOpenSearchDashboardsReactContext } from '../../../../opensearch_dashboards_react/public';
 import { coreMock } from '../../../../../core/public/mocks';
 
 const mockCoreStart = coreMock.createStart();
+const displayedCollaboratorTypes = [
+  {
+    id: 'user',
+    name: 'User',
+    buttonLabel: 'Add Users',
+    onAdd: async () => {},
+    getDisplayedType: ({ permissionType }) => (permissionType === 'user' ? 'User' : undefined),
+  },
+  {
+    id: 'group',
+    name: 'Group',
+    buttonLabel: 'Add Groups',
+    onAdd: async () => {},
+    getDisplayedType: ({ permissionType }) => (permissionType === 'group' ? 'Group' : undefined),
+  },
+];
 
 const mockOverlays = {
   openModal: jest.fn(),
@@ -21,9 +37,35 @@ const { Provider } = createOpenSearchDashboardsReactContext({
   overlays: mockOverlays,
 });
 
+describe('getDisplayedTypes', () => {
+  it('should return undefined if not match any collaborator type', () => {
+    expect(
+      getDisplayedType(displayedCollaboratorTypes, { permissionType: 'unknown' })
+    ).toBeUndefined();
+  });
+  it('should return "User"', () => {
+    expect(
+      getDisplayedType(displayedCollaboratorTypes, {
+        collaboratorId: 'foo',
+        permissionType: 'user',
+        accessLevel: 'readOnly',
+      })
+    ).toEqual('User');
+  });
+  it('should return "Group"', () => {
+    expect(
+      getDisplayedType(displayedCollaboratorTypes, {
+        collaboratorId: 'foo',
+        permissionType: 'group',
+        accessLevel: 'readOnly',
+      })
+    ).toEqual('Group');
+  });
+});
+
 describe('WorkspaceCollaboratorTable', () => {
   const mockProps = {
-    displayedCollaboratorTypes: [],
+    displayedCollaboratorTypes,
     permissionSettings: [
       {
         id: 0,
@@ -37,6 +79,11 @@ describe('WorkspaceCollaboratorTable', () => {
         type: 'group',
         group: 'group',
       },
+      {
+        id: 2,
+        modes: ['library_read', 'read'],
+        type: 'unknown',
+      },
     ],
     handleSubmitPermissionSettings: jest.fn(),
   };
@@ -86,6 +133,33 @@ describe('WorkspaceCollaboratorTable', () => {
     expect(mockOverlays.openModal).toHaveBeenCalled();
   });
 
+  it('should openModal when clicking one selection delete', () => {
+    const permissionSettings = [
+      {
+        id: 0,
+        modes: ['library_write', 'write'],
+        type: 'user',
+        userId: 'admin',
+      },
+      {
+        id: 1,
+        modes: ['library_read', 'read'],
+        type: 'group',
+        group: 'group',
+      },
+    ];
+
+    const { getByText, getByTestId } = render(
+      <Provider>
+        <WorkspaceCollaboratorTable {...mockProps} permissionSettings={permissionSettings} />
+      </Provider>
+    );
+    fireEvent.click(getByTestId('checkboxSelectRow-0'));
+    const deleteCollaborator = getByText('Delete 1 collaborator');
+    fireEvent.click(deleteCollaborator);
+    expect(mockOverlays.openModal).toHaveBeenCalled();
+  });
+
   it('should openModal when clicking multi selection delete', () => {
     const permissionSettings = [
       {
diff --git a/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.tsx b/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.tsx
index b0f537c30c05..0fb31283f5eb 100644
--- a/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/workspace_collaborator_table.tsx
@@ -22,46 +22,117 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import { WorkspacePermissionSetting } from './types';
-import { WorkspacePermissionItemType, permissionModeOptions, typeOptions } from './constants';
-import { getPermissionModeId } from './utils';
+import { WorkspacePermissionItemType } from './constants';
+import { getPermissionModeId, isWorkspacePermissionSetting } from './utils';
 import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
+import { PermissionModeId } from '../../../../../core/public';
 import { AddCollaboratorButton } from './add_collaborator_button';
 import { WorkspaceCollaboratorType } from '../../services/workspace_collaborator_types_service';
 import {
   WORKSPACE_ACCESS_LEVEL_NAMES,
   accessLevelNameToWorkspacePermissionModesMap,
 } from '../../constants';
-import { WorkspaceCollaboratorAccessLevel } from '../../types';
+import { WorkspaceCollaborator, WorkspaceCollaboratorAccessLevel } from '../../types';
 import { BackgroundPic } from '../../assets/background_pic';
 
 export type PermissionSetting = Pick<WorkspacePermissionSetting, 'id'> &
   Partial<WorkspacePermissionSetting>;
 
+// TODO: Update PermissionModeId to align with WorkspaceCollaboratorAccessLevel
+const permissionModeId2WorkspaceAccessLevelMap: {
+  [key in PermissionModeId]: WorkspaceCollaboratorAccessLevel;
+} = {
+  [PermissionModeId.Owner]: 'admin',
+  [PermissionModeId.Read]: 'readOnly',
+  [PermissionModeId.ReadAndWrite]: 'readAndWrite',
+};
+
+const deletionModalConfirmButton = i18n.translate(
+  'workspace.detail.collaborator.delete.modal.confirm',
+  {
+    defaultMessage: 'Confirm',
+  }
+);
+
+const deletionModalCancelButton = i18n.translate(
+  'workspace.detail.collaborator.delete.modal.cancel',
+  {
+    defaultMessage: 'Cancel',
+  }
+);
+
+const deletionModalWarning = i18n.translate(
+  'workspace.workspace.detail.collaborator.modal.delete.warning',
+  {
+    defaultMessage:
+      'Currently you’re the only user who has access to the workspace as an owner. Share this workspace by adding collaborators.',
+  }
+);
+const deletionModalConfirm = i18n.translate('workspace.detail.collaborator.modal.delete.confirm', {
+  defaultMessage: 'Delete collaborator? The collaborators will not have access to the workspace.',
+});
+
+const convertPermissionSettingToWorkspaceCollaborator = (
+  permissionSetting: WorkspacePermissionSetting
+) => ({
+  collaboratorId:
+    permissionSetting.type === WorkspacePermissionItemType.User
+      ? permissionSetting.userId
+      : permissionSetting.group,
+  permissionType: permissionSetting.type,
+  accessLevel:
+    permissionModeId2WorkspaceAccessLevelMap[getPermissionModeId(permissionSetting.modes)],
+});
+
+export const getDisplayedType = (
+  supportCollaboratorTypes: WorkspaceCollaboratorType[],
+  collaborator: WorkspaceCollaborator
+) => {
+  for (const collaboratorType of supportCollaboratorTypes) {
+    const displayedType = collaboratorType.getDisplayedType?.(collaborator);
+    if (displayedType) {
+      return displayedType;
+    }
+  }
+};
+
 interface Props {
   permissionSettings: PermissionSetting[];
   displayedCollaboratorTypes: WorkspaceCollaboratorType[];
-  handleSubmitPermissionSettings: (permissionSettings: WorkspacePermissionSetting[]) => void;
+  handleSubmitPermissionSettings: (
+    permissionSettings: WorkspacePermissionSetting[]
+  ) => Promise<void>;
 }
 
+type PermissionSettingWithAccessLevelAndDisplayedType = PermissionSetting & {
+  accessLevel?: string;
+  displayedType?: string;
+};
+
 export const WorkspaceCollaboratorTable = ({
   permissionSettings,
   displayedCollaboratorTypes,
   handleSubmitPermissionSettings,
 }: Props) => {
-  const [selection, setSelection] = useState<PermissionSetting[]>([]);
+  const [selection, setSelection] = useState<PermissionSettingWithAccessLevelAndDisplayedType[]>(
+    []
+  );
   const { overlays } = useOpenSearchDashboards();
 
-  const items = useMemo(() => {
+  const items: PermissionSettingWithAccessLevelAndDisplayedType[] = useMemo(() => {
     return permissionSettings.map((setting) => {
+      const collaborator = isWorkspacePermissionSetting(setting)
+        ? convertPermissionSettingToWorkspaceCollaborator(setting)
+        : undefined;
       const basicSettings = {
         ...setting,
         // This is used for table display and search match.
-        displayedType:
-          typeOptions.find((option) => option.value === setting.type)?.inputDisplay ?? '',
-        accessLevel:
-          permissionModeOptions.find(
-            (option) => option.value === getPermissionModeId(setting.modes ?? [])
-          )?.inputDisplay ?? '',
+        displayedType: collaborator
+          ? getDisplayedType(displayedCollaboratorTypes, collaborator)
+          : undefined,
+        accessLevel: collaborator
+          ? WORKSPACE_ACCESS_LEVEL_NAMES[collaborator.accessLevel]
+          : undefined,
       };
       // Unique primary key and filter null value
       if (setting.type === WorkspacePermissionItemType.User) {
@@ -78,7 +149,12 @@ export const WorkspaceCollaboratorTable = ({
       }
       return basicSettings;
     });
-  }, [permissionSettings]);
+  }, [permissionSettings, displayedCollaboratorTypes]);
+
+  const adminCollarboratorsNum = useMemo(() => {
+    const admins = items.filter((item) => item.accessLevel === WORKSPACE_ACCESS_LEVEL_NAMES.admin);
+    return admins.length;
+  }, [items]);
 
   const emptyStateMessage = useMemo(() => {
     return (
@@ -113,7 +189,18 @@ export const WorkspaceCollaboratorTable = ({
     );
   }, [displayedCollaboratorTypes, permissionSettings, handleSubmitPermissionSettings]);
 
-  const openDeleteConfirmModal = ({ onConfirm }: { onConfirm: () => void }) => {
+  const openDeleteConfirmModal = ({
+    onConfirm,
+    selections,
+  }: {
+    onConfirm: () => void;
+    selections: PermissionSettingWithAccessLevelAndDisplayedType[];
+  }) => {
+    const adminOfSelection = selections.filter(
+      (item) => item.accessLevel === WORKSPACE_ACCESS_LEVEL_NAMES.admin
+    ).length;
+    const shouldShowWarning =
+      adminCollarboratorsNum === adminOfSelection && adminCollarboratorsNum !== 0;
     const modal = overlays.openModal(
       <EuiConfirmModal
         title={i18n.translate('workspace.detail.collaborator.actions.delete', {
@@ -121,16 +208,11 @@ export const WorkspaceCollaboratorTable = ({
         })}
         onCancel={() => modal.close()}
         onConfirm={onConfirm}
-        cancelButtonText="Cancel"
-        confirmButtonText="Confirm"
+        cancelButtonText={deletionModalCancelButton}
+        confirmButtonText={deletionModalConfirmButton}
       >
-        <EuiText>
-          <p>
-            {i18n.translate('workspace.detail.collaborator.delete.confirm', {
-              defaultMessage:
-                'Delete collaborator? The collaborators will not have access to the workspace.',
-            })}
-          </p>
+        <EuiText color={shouldShowWarning ? 'danger' : 'default'}>
+          <p>{shouldShowWarning ? deletionModalWarning : deletionModalConfirm}</p>
         </EuiText>
       </EuiConfirmModal>
     );
@@ -153,15 +235,22 @@ export const WorkspaceCollaboratorTable = ({
           setSelection([]);
           modal.close();
         },
+        selections: selection,
       });
     };
 
     return (
-      <EuiButton color="danger" iconType="trash" onClick={onClick}>
-        {i18n.translate('workspace.detail.collaborator.delete', {
-          defaultMessage: 'Delete {num} collaborators',
+      <EuiButton
+        color="danger"
+        iconType="trash"
+        onClick={onClick}
+        data-test-subj="confirm-delete-button"
+      >
+        {i18n.translate('workspace.detail.collaborator.delete.button.info', {
+          defaultMessage: 'Delete {num} collaborator{pluralSuffix, select, true {} other {s}}',
           values: {
             num: selection.length,
+            pluralSuffix: selection.length === 1,
           },
         })}
       </EuiButton>
@@ -192,31 +281,31 @@ export const WorkspaceCollaboratorTable = ({
         field: 'displayedType',
         name: 'Type',
         multiSelect: false,
-        options: Array.from(new Set(items.map(({ displayedType }) => displayedType ?? ''))).map(
-          (item) => ({
-            value: item,
-            name: item,
-          })
-        ),
+        options: Array.from(
+          new Set(items.flatMap(({ displayedType }) => (!!displayedType ? [displayedType] : [])))
+        ).map((item) => ({
+          value: item,
+          name: item,
+        })),
       },
       {
         type: 'field_value_selection',
         field: 'accessLevel',
         name: 'Access level',
         multiSelect: false,
-        options: Array.from(new Set(items.map(({ accessLevel }) => accessLevel ?? ''))).map(
-          (item) => ({
-            value: item,
-            name: item,
-          })
-        ),
+        options: Array.from(
+          new Set(items.flatMap(({ accessLevel }) => (!!accessLevel ? [accessLevel] : [])))
+        ).map((item) => ({
+          value: item,
+          name: item,
+        })),
       },
     ],
     toolsLeft: renderToolsLeft(),
     toolsRight: renderToolsRight(),
   };
 
-  const columns: Array<EuiBasicTableColumn<PermissionSetting>> = [
+  const columns: Array<EuiBasicTableColumn<PermissionSettingWithAccessLevelAndDisplayedType>> = [
     {
       field: 'primaryId',
       name: 'ID',
@@ -224,15 +313,17 @@ export const WorkspaceCollaboratorTable = ({
     {
       field: 'displayedType',
       name: 'Type',
+      render: (displayedType: string) => displayedType || <>&mdash;</>,
     },
     {
       field: 'accessLevel',
       name: 'Access level',
+      render: (accessLevel: string) => accessLevel || <>&mdash;</>,
     },
     {
       name: 'Actions',
       field: '',
-      render: (item: PermissionSetting) => (
+      render: (item: PermissionSettingWithAccessLevelAndDisplayedType) => (
         <Actions
           isTableAction={true}
           selection={[item]}
@@ -243,7 +334,7 @@ export const WorkspaceCollaboratorTable = ({
       ),
     },
   ];
-  const selectionValue: EuiTableSelectionType<PermissionSetting> = {
+  const selectionValue: EuiTableSelectionType<PermissionSettingWithAccessLevelAndDisplayedType> = {
     onSelectionChange: (newSelection) => setSelection(newSelection),
   };
 
@@ -269,10 +360,16 @@ const Actions = ({
   openDeleteConfirmModal,
 }: {
   isTableAction: boolean;
-  selection?: PermissionSetting[];
+  selection?: PermissionSettingWithAccessLevelAndDisplayedType[];
   permissionSettings: PermissionSetting[];
   handleSubmitPermissionSettings: (permissionSettings: WorkspacePermissionSetting[]) => void;
-  openDeleteConfirmModal?: ({ onConfirm }: { onConfirm: () => void }) => { close: () => void };
+  openDeleteConfirmModal?: ({
+    onConfirm,
+    selections,
+  }: {
+    onConfirm: () => void;
+    selections: PermissionSettingWithAccessLevelAndDisplayedType[];
+  }) => { close: () => void };
 }) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const { overlays } = useOpenSearchDashboards();
@@ -354,6 +451,7 @@ const Actions = ({
                   handleSubmitPermissionSettings(newSettings as WorkspacePermissionSetting[]);
                   modal.close();
                 },
+                selections: selection,
               });
             }
           },
diff --git a/src/plugins/workspace/public/components/workspace_form/workspace_detail_form.tsx b/src/plugins/workspace/public/components/workspace_form/workspace_detail_form.tsx
index 1466ef3bae66..84a84c677586 100644
--- a/src/plugins/workspace/public/components/workspace_form/workspace_detail_form.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/workspace_detail_form.tsx
@@ -24,10 +24,15 @@ import { WorkspaceFormErrorCallout } from './workspace_form_error_callout';
 import { useWorkspaceFormContext } from './workspace_form_context';
 import { WorkspaceDetailFormDetails } from './workspace_detail_form_details';
 import { WorkspaceCollaboratorTable } from './workspace_collaborator_table';
-import { WorkspaceCollaboratorTypesService } from '../../services/workspace_collaborator_types_service';
+import {
+  WorkspaceCollaboratorType,
+  WorkspaceCollaboratorTypesService,
+} from '../../services/workspace_collaborator_types_service';
 import { AddCollaboratorButton } from './add_collaborator_button';
 import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
 
+const EMPTY_COLLABORATOR_TYPES: WorkspaceCollaboratorType[] = [];
+
 interface WorkspaceDetailedFormProps extends Omit<WorkspaceFormProps, 'onAppLeave'> {
   detailTab?: DetailTab;
   detailTitle?: string;
@@ -51,7 +56,8 @@ export const WorkspaceDetailForm = (props: WorkspaceDetailedFormProps) => {
     services: { collaboratorTypes },
   } = useOpenSearchDashboards<{ collaboratorTypes: WorkspaceCollaboratorTypesService }>();
 
-  const displayedCollaboratorTypes = useObservable(collaboratorTypes.getTypes$()) ?? [];
+  const displayedCollaboratorTypes =
+    useObservable(collaboratorTypes.getTypes$()) ?? EMPTY_COLLABORATOR_TYPES;
 
   return (
     <EuiForm
diff --git a/src/plugins/workspace/public/components/workspace_form/workspace_form_context.tsx b/src/plugins/workspace/public/components/workspace_form/workspace_form_context.tsx
index 0ec3bffebc77..45d77f7aef5f 100644
--- a/src/plugins/workspace/public/components/workspace_form/workspace_form_context.tsx
+++ b/src/plugins/workspace/public/components/workspace_form/workspace_form_context.tsx
@@ -32,7 +32,9 @@ interface WorkspaceFormContextProps {
   >;
   setSelectedDataSourceConnections: React.Dispatch<React.SetStateAction<DataSourceConnection[]>>;
   onAppLeave: AppMountParameters['onAppLeave'];
-  handleSubmitPermissionSettings: (permissionSettings: WorkspacePermissionSetting[]) => void;
+  handleSubmitPermissionSettings: (
+    permissionSettings: WorkspacePermissionSetting[]
+  ) => Promise<void>;
 }
 
 const initialContextValue: WorkspaceFormContextProps = {} as WorkspaceFormContextProps;
diff --git a/src/plugins/workspace/public/components/workspace_initial/__snapshots__/workspace_initial.test.tsx.snap b/src/plugins/workspace/public/components/workspace_initial/__snapshots__/workspace_initial.test.tsx.snap
index a9e8913a921d..bfca9170fa36 100644
--- a/src/plugins/workspace/public/components/workspace_initial/__snapshots__/workspace_initial.test.tsx.snap
+++ b/src/plugins/workspace/public/components/workspace_initial/__snapshots__/workspace_initial.test.tsx.snap
@@ -11,6 +11,10 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
     >
       <span
         data-euiicon-type="logoOpenSearch"
+        style="position: fixed;"
+      />
+      <div
+        class="euiSpacer euiSpacer--xl"
       />
       <div
         class="euiSpacer euiSpacer--l"
@@ -20,7 +24,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
       >
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
-          style="width: 1264px;"
+          style="max-width: 1264px; width: 100%;"
         >
           <div
             class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -41,7 +45,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
               >
                 <div
                   class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -104,17 +108,17 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
               </div>
             </div>
             <div
-              class="euiFlexItem"
+              class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive eui-xScroll"
               >
                 <div
                   class="euiFlexItem"
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__observability"
@@ -241,7 +245,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__security-analytics"
@@ -368,7 +372,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__essentials"
@@ -495,7 +499,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is OS
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__search"
@@ -732,6 +736,10 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
     >
       <span
         data-euiicon-type="logoOpenSearch"
+        style="position: fixed;"
+      />
+      <div
+        class="euiSpacer euiSpacer--xl"
       />
       <div
         class="euiSpacer euiSpacer--l"
@@ -741,7 +749,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
       >
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
-          style="width: 1264px;"
+          style="max-width: 1264px; width: 100%;"
         >
           <div
             class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -762,7 +770,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
               >
                 <div
                   class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -792,17 +800,17 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
               </div>
             </div>
             <div
-              class="euiFlexItem"
+              class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive eui-xScroll"
               >
                 <div
                   class="euiFlexItem"
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__observability"
@@ -905,7 +913,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__security-analytics"
@@ -1008,7 +1016,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__essentials"
@@ -1111,7 +1119,7 @@ exports[`WorkspaceInitial render workspace initial page normally when user is no
                 >
                   <div
                     class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--flexGrowZero euiSplitPanel"
-                    style="height: 416px; min-width: 235px;"
+                    style="height: 416px; min-width: 240px;"
                   >
                     <div
                       class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner workspace-initial-use-case-card__search"
diff --git a/src/plugins/workspace/public/components/workspace_initial/workspace_initial.scss b/src/plugins/workspace/public/components/workspace_initial/workspace_initial.scss
index 99fd7c1f37e0..56a762a0fca0 100644
--- a/src/plugins/workspace/public/components/workspace_initial/workspace_initial.scss
+++ b/src/plugins/workspace/public/components/workspace_initial/workspace_initial.scss
@@ -17,4 +17,5 @@
   margin: auto;
   padding-left: 48px;
   padding-right: 48px;
+  width: 100%;
 }
diff --git a/src/plugins/workspace/public/components/workspace_initial/workspace_initial.tsx b/src/plugins/workspace/public/components/workspace_initial/workspace_initial.tsx
index 4d049a8dd892..bcdb26d60005 100644
--- a/src/plugins/workspace/public/components/workspace_initial/workspace_initial.tsx
+++ b/src/plugins/workspace/public/components/workspace_initial/workspace_initial.tsx
@@ -157,7 +157,12 @@ export const WorkspaceInitial = ({ registeredUseCases$ }: WorkspaceInitialProps)
       </EuiFlexItem>
       <EuiSpacer size="l" />
       <EuiFlexItem grow={false}>
-        <EuiFlexGroup direction="row" justifyContent="spaceBetween" alignItems="center">
+        <EuiFlexGroup
+          direction="row"
+          justifyContent="spaceBetween"
+          alignItems="center"
+          gutterSize="m"
+        >
           <EuiFlexItem grow={false}>
             <div style={{ display: 'flex', alignItems: 'center' }}>
               <EuiIcon type="wsSelector" size="m" />
@@ -181,8 +186,8 @@ export const WorkspaceInitial = ({ registeredUseCases$ }: WorkspaceInitialProps)
           <EuiFlexItem grow={false}>{isDashboardAdmin && createWorkspacePopover}</EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiFlexGroup justifyContent="spaceBetween" gutterSize="m">
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup justifyContent="spaceBetween" gutterSize="m" className="eui-xScroll">
           {useCaseCards}
         </EuiFlexGroup>
       </EuiFlexItem>
@@ -241,15 +246,15 @@ export const WorkspaceInitial = ({ registeredUseCases$ }: WorkspaceInitialProps)
   return (
     <EuiPage style={{ minHeight: '100vh' }}>
       <EuiPageBody>
-        <EuiIcon type="logoOpenSearch" size="xl" />
+        <EuiIcon type="logoOpenSearch" size="xl" style={{ position: 'fixed' }} />
+        <EuiSpacer size="xl" />
         <EuiSpacer size="l" />
         <EuiFlexGroup
           direction="column"
           alignItems="center"
-          justifyContent="flexStart"
           className="workspace-initial__flex-group-responsive"
         >
-          <EuiFlexItem grow={false} style={{ width: '1264px' }}>
+          <EuiFlexItem grow={false} style={{ maxWidth: '1264px', width: '100%' }}>
             {content}
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/src/plugins/workspace/public/components/workspace_initial/workspace_use_case_card.tsx b/src/plugins/workspace/public/components/workspace_initial/workspace_use_case_card.tsx
index c38e253239c6..132b365d8e08 100644
--- a/src/plugins/workspace/public/components/workspace_initial/workspace_use_case_card.tsx
+++ b/src/plugins/workspace/public/components/workspace_initial/workspace_use_case_card.tsx
@@ -111,7 +111,7 @@ export const WorkspaceUseCaseCard = ({
   };
 
   return (
-    <EuiSplitPanel.Outer style={{ height: '416px', minWidth: '235px' }}>
+    <EuiSplitPanel.Outer style={{ height: '416px', minWidth: '240px' }}>
       <EuiSplitPanel.Inner
         paddingSize="m"
         grow={!hasWorkspaces}
diff --git a/src/plugins/workspace/public/components/workspace_selector/workspace_selector.scss b/src/plugins/workspace/public/components/workspace_selector/workspace_selector.scss
index b62ea9dde66a..685d823b30c6 100644
--- a/src/plugins/workspace/public/components/workspace_selector/workspace_selector.scss
+++ b/src/plugins/workspace/public/components/workspace_selector/workspace_selector.scss
@@ -1,3 +1,9 @@
 .workspaceNameLabel {
   background-color: $euiSideNavBackgroundColor;
 }
+
+.workspaceSelectorPopoverButton:hover,
+.workspaceSelectorPopoverButton:focus {
+  transition: none !important;
+  transform: none !important;
+}
diff --git a/src/plugins/workspace/public/components/workspace_selector/workspace_selector.tsx b/src/plugins/workspace/public/components/workspace_selector/workspace_selector.tsx
index e3a530ce507f..f0c0243703f5 100644
--- a/src/plugins/workspace/public/components/workspace_selector/workspace_selector.tsx
+++ b/src/plugins/workspace/public/components/workspace_selector/workspace_selector.tsx
@@ -66,6 +66,7 @@ export const WorkspaceSelector = ({ coreStart, registeredUseCases$ }: Props) =>
   };
   const button = currentWorkspace ? (
     <EuiPanel
+      className="workspaceSelectorPopoverButton"
       paddingSize="none"
       color="transparent"
       hasBorder={false}
diff --git a/src/plugins/workspace/public/plugin.ts b/src/plugins/workspace/public/plugin.ts
index e54f189d2516..58d5c663a5a5 100644
--- a/src/plugins/workspace/public/plugin.ts
+++ b/src/plugins/workspace/public/plugin.ts
@@ -68,13 +68,10 @@ import {
   setAnalyticsAllOverviewSection,
 } from './components/use_case_overview/setup_overview';
 import { UserDefaultWorkspace } from './components/workspace_list/default_workspace';
-import {
-  WorkspaceCollaboratorTypesService,
-  UseCaseService,
-  WorkspaceCollaboratorType,
-} from './services';
+import { WorkspaceCollaboratorTypesService, UseCaseService } from './services';
 import { AddCollaboratorsModal } from './components/add_collaborators_modal';
 import { registerDefaultCollaboratorTypes } from './register_default_collaborator_types';
+import { searchPages } from './components/global_search/search_pages_command';
 
 type WorkspaceAppType = (
   params: AppMountParameters,
@@ -542,6 +539,13 @@ export class WorkspacePlugin
       },
     ]);
 
+    core.chrome.globalSearch.registerSearchCommand({
+      id: 'pagesSearch',
+      type: 'PAGES',
+      run: async (query: string, callback: () => void) =>
+        searchPages(query, this.registeredUseCases$, this.coreStart, callback),
+    });
+
     if (workspaceId) {
       core.chrome.registerCollapsibleNavHeader(() => {
         if (!this.coreStart) {
diff --git a/src/plugins/workspace/public/register_default_collaborator_types.test.tsx b/src/plugins/workspace/public/register_default_collaborator_types.test.tsx
index 3a711dc87a7e..5ebac9732015 100644
--- a/src/plugins/workspace/public/register_default_collaborator_types.test.tsx
+++ b/src/plugins/workspace/public/register_default_collaborator_types.test.tsx
@@ -48,7 +48,7 @@ describe('generateOnAddCallback', () => {
     title: 'Test Title',
     inputLabel: 'Test Input Label',
     addAnotherButtonLabel: 'Test Add Another Button Label',
-    permissionType: 'test',
+    permissionType: 'user' as const,
   };
 
   beforeEach(() => {
@@ -127,4 +127,30 @@ describe('registerDefaultCollaboratorTypes', () => {
     expect(groupType?.name).toBe('Group');
     expect(groupType?.buttonLabel).toBe('Add Groups');
   });
+
+  it('should return consistent displayed types', () => {
+    registerDefaultCollaboratorTypes({ collaboratorTypesService, getStartServices });
+
+    const registeredTypes = collaboratorTypesService.getTypes$().getValue();
+    expect(registeredTypes).toHaveLength(2);
+
+    const userType = registeredTypes.find((type) => type.id === 'user');
+    const groupType = registeredTypes.find((type) => type.id === 'group');
+    const adminUserCollaborator = {
+      permissionType: 'user' as const,
+      collaboratorId: '',
+      accessLevel: 'admin' as const,
+    };
+    const adminGroupCollaborator = {
+      permissionType: 'group' as const,
+      collaboratorId: '',
+      accessLevel: 'admin' as const,
+    };
+
+    expect(userType?.getDisplayedType?.(adminUserCollaborator)).toBe('User');
+    expect(userType?.getDisplayedType?.(adminGroupCollaborator)).toBeUndefined();
+
+    expect(groupType?.getDisplayedType?.(adminUserCollaborator)).toBeUndefined();
+    expect(groupType?.getDisplayedType?.(adminGroupCollaborator)).toBe('Group');
+  });
 });
diff --git a/src/plugins/workspace/public/register_default_collaborator_types.tsx b/src/plugins/workspace/public/register_default_collaborator_types.tsx
index 09fe96ae4db4..0f917acdeecd 100644
--- a/src/plugins/workspace/public/register_default_collaborator_types.tsx
+++ b/src/plugins/workspace/public/register_default_collaborator_types.tsx
@@ -55,6 +55,12 @@ export const registerDefaultCollaboratorTypes = ({
       buttonLabel: i18n.translate('workspace.collaboratorType.defaultUser.buttonLabel', {
         defaultMessage: 'Add Users',
       }),
+      getDisplayedType: ({ permissionType }) =>
+        permissionType === 'user'
+          ? i18n.translate('workspace.collaboratorType.defaultUser.displayedType', {
+              defaultMessage: 'User',
+            })
+          : undefined,
       onAdd: generateOnAddCallback({
         getStartServices,
         title: i18n.translate('workspace.collaboratorType.defaultUser.modalTitle', {
@@ -86,6 +92,12 @@ export const registerDefaultCollaboratorTypes = ({
       buttonLabel: i18n.translate('workspace.collaboratorType.defaultGroup.buttonLabel', {
         defaultMessage: 'Add Groups',
       }),
+      getDisplayedType: ({ permissionType }) =>
+        permissionType === 'group'
+          ? i18n.translate('workspace.collaboratorType.defaultGroup.displayedType', {
+              defaultMessage: 'Group',
+            })
+          : undefined,
       onAdd: generateOnAddCallback({
         getStartServices,
         title: i18n.translate('workspace.collaboratorType.defaultGroup.modalTitle', {
diff --git a/src/plugins/workspace/public/workspace_client.ts b/src/plugins/workspace/public/workspace_client.ts
index 5b5b3ca95ed8..608f9a0fd59b 100644
--- a/src/plugins/workspace/public/workspace_client.ts
+++ b/src/plugins/workspace/public/workspace_client.ts
@@ -11,9 +11,11 @@ import {
   WorkspaceAttribute,
   WorkspacesSetup,
   IWorkspaceClient,
+  IWorkspaceResponse as IResponse,
 } from '../../../core/public';
 import { WorkspacePermissionMode } from '../common/constants';
 import { SavedObjectPermissions, WorkspaceAttributeWithPermission } from '../../../core/types';
+import { DataSourceAssociation } from './components/data_source_association/data_source_association';
 
 const WORKSPACES_API_BASE_URL = '/api/workspaces';
 
@@ -23,16 +25,6 @@ const join = (...uriComponents: Array<string | undefined>) =>
     .map(encodeURIComponent)
     .join('/');
 
-type IResponse<T> =
-  | {
-      result: T;
-      success: true;
-    }
-  | {
-      success: false;
-      error?: string;
-    };
-
 interface WorkspaceFindOptions {
   page?: number;
   perPage?: number;
@@ -72,7 +64,7 @@ export class WorkspaceClient implements IWorkspaceClient {
    * Add a non-throw-error fetch method,
    * so that consumers only need to care about
    * if the success is false instead of wrapping the call with a try catch
-   * and judge the error both in catch clause and if(!success) cluase.
+   * and judge the error both in catch clause and if(!success) clause.
    */
   private safeFetch = async <T = any>(
     path: string,
@@ -348,6 +340,40 @@ export class WorkspaceClient implements IWorkspaceClient {
     return result;
   }
 
+  public async associate(savedObjects: Array<{ id: string; type: string }>, workspaceId: string) {
+    const path = this.getPath('_associate');
+    const body = {
+      savedObjects,
+      workspaceId,
+    };
+    const result = await this.safeFetch<Array<{ id: string; type: string }>>(path, {
+      method: 'POST',
+      body: JSON.stringify(body),
+    });
+
+    return result;
+  }
+
+  public async dissociate(savedObjects: Array<{ id: string; type: string }>, workspaceId: string) {
+    const path = this.getPath('_dissociate');
+    const body = {
+      savedObjects,
+      workspaceId,
+    };
+    const result = await this.safeFetch<Array<{ id: string; type: string }>>(path, {
+      method: 'POST',
+      body: JSON.stringify(body),
+    });
+
+    return result;
+  }
+
+  ui() {
+    return {
+      DataSourceAssociation,
+    };
+  }
+
   public stop() {
     this.workspaces.workspaceList$.unsubscribe();
     this.workspaces.currentWorkspaceId$.unsubscribe();
diff --git a/src/plugins/workspace/server/permission_control/client.ts b/src/plugins/workspace/server/permission_control/client.ts
index c6e147f3609c..1d3940c56265 100644
--- a/src/plugins/workspace/server/permission_control/client.ts
+++ b/src/plugins/workspace/server/permission_control/client.ts
@@ -16,7 +16,11 @@ import {
   HttpAuth,
 } from '../../../../core/server';
 import { WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID } from '../../common/constants';
-import { getPrincipalsFromRequest } from '../../../../core/server/utils';
+import {
+  ACLAuditorStateKey,
+  getACLAuditor,
+  getPrincipalsFromRequest,
+} from '../../../../core/server/utils';
 
 export type SavedObjectsPermissionControlContract = Pick<
   SavedObjectsPermissionControl,
@@ -57,6 +61,7 @@ export class SavedObjectsPermissionControl {
     request: OpenSearchDashboardsRequest,
     savedObjects: SavedObjectsBulkGetObject[]
   ) {
+    const ACLAuditor = getACLAuditor(request);
     const requestKey = request.uuid;
     const savedObjectsToGet = savedObjects.filter(
       (savedObject) =>
@@ -66,6 +71,8 @@ export class SavedObjectsPermissionControl {
       savedObjectsToGet.length > 0
         ? (await this.getScopedClient?.(request)?.bulkGet(savedObjectsToGet))?.saved_objects || []
         : [];
+    // System request, -1 * savedObjectsToGet.length for compensation.
+    ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, -1 * savedObjectsToGet.length);
 
     const retrievedSavedObjectsMap: { [key: string]: SavedObject } = {};
     retrievedSavedObjects.forEach((savedObject) => {
diff --git a/src/plugins/workspace/server/plugin.test.ts b/src/plugins/workspace/server/plugin.test.ts
index b9a402c306f9..20f925f4a89f 100644
--- a/src/plugins/workspace/server/plugin.test.ts
+++ b/src/plugins/workspace/server/plugin.test.ts
@@ -6,7 +6,12 @@
 import { OnPostAuthHandler, OnPreRoutingHandler } from 'src/core/server';
 import { coreMock, httpServerMock, uiSettingsServiceMock } from '../../../core/server/mocks';
 import { WorkspacePlugin } from './plugin';
-import { getWorkspaceState, updateWorkspaceState } from '../../../core/server/utils';
+import {
+  getACLAuditor,
+  getClientCallAuditor,
+  getWorkspaceState,
+  updateWorkspaceState,
+} from '../../../core/server/utils';
 import * as serverUtils from '../../../core/server/utils/auth_info';
 import * as utilsExports from './utils';
 import { SavedObjectsPermissionControl } from './permission_control/client';
@@ -44,7 +49,7 @@ describe('Workspace server plugin', () => {
         },
       }
     `);
-    expect(setupMock.savedObjects.addClientWrapper).toBeCalledTimes(4);
+    expect(setupMock.savedObjects.addClientWrapper).toBeCalledTimes(5);
 
     let registerSwitcher;
     let result;
@@ -180,6 +185,68 @@ describe('Workspace server plugin', () => {
       preResponseFn(requestWithWorkspaceInUrl, { statusCode: 200 }, toolKitMock);
       expect(clearSavedObjectsCacheMock).toHaveBeenCalled();
     });
+
+    describe('#ACL auditor', () => {
+      it('should initialize 2 auditors when permission control is enabled', async () => {
+        const coreSetupMock = coreMock.createSetup();
+        await workspacePlugin.setup(coreSetupMock);
+        const toolKitMock = httpServerMock.createToolkit();
+
+        const postAuthFn = coreSetupMock.http.registerOnPostAuth.mock.calls[1][0];
+        const mockedRequest = httpServerMock.createOpenSearchDashboardsRequest();
+
+        postAuthFn(mockedRequest, httpServerMock.createResponseFactory(), toolKitMock);
+        expect(getACLAuditor(mockedRequest)).toBeTruthy();
+        expect(getClientCallAuditor(mockedRequest)).toBeTruthy();
+      });
+
+      it('should clean up 2 auditors when permission control is enabled and non dashboard admin', async () => {
+        const coreSetupMock = coreMock.createSetup();
+        await workspacePlugin.setup(coreSetupMock);
+        const toolKitMock = httpServerMock.createToolkit();
+
+        const postAuthFn = coreSetupMock.http.registerOnPostAuth.mock.calls[1][0];
+        const preResponse = coreSetupMock.http.registerOnPreResponse.mock.calls[1][0];
+
+        const nonDashboardAdminRequest = httpServerMock.createOpenSearchDashboardsRequest();
+        postAuthFn(nonDashboardAdminRequest, httpServerMock.createResponseFactory(), toolKitMock);
+        const aclAuditorForNonDashboardAdmin = getACLAuditor(nonDashboardAdminRequest);
+        let checkoutSpy;
+        if (aclAuditorForNonDashboardAdmin) {
+          checkoutSpy = jest.spyOn(aclAuditorForNonDashboardAdmin, 'checkout');
+        }
+
+        preResponse(nonDashboardAdminRequest, { statusCode: 200 }, toolKitMock);
+
+        expect(checkoutSpy).toBeCalled();
+        expect(getACLAuditor(nonDashboardAdminRequest)).toBeFalsy();
+        expect(getClientCallAuditor(nonDashboardAdminRequest)).toBeFalsy();
+      });
+
+      it('should not checkout when request user is dashboard admin', async () => {
+        const coreSetupMock = coreMock.createSetup();
+        await workspacePlugin.setup(coreSetupMock);
+        const toolKitMock = httpServerMock.createToolkit();
+
+        const postAuthFn = coreSetupMock.http.registerOnPostAuth.mock.calls[1][0];
+        const preResponse = coreSetupMock.http.registerOnPreResponse.mock.calls[1][0];
+
+        // request flow for dashboard admin
+        const dashboardAdminRequest = httpServerMock.createOpenSearchDashboardsRequest();
+        updateWorkspaceState(dashboardAdminRequest, {
+          isDashboardAdmin: true,
+        });
+        postAuthFn(dashboardAdminRequest, httpServerMock.createResponseFactory(), toolKitMock);
+        const aclAuditorForDashboardAdmin = getACLAuditor(dashboardAdminRequest);
+        let checkoutSpy;
+        if (aclAuditorForDashboardAdmin) {
+          checkoutSpy = jest.spyOn(aclAuditorForDashboardAdmin, 'checkout');
+        }
+        preResponse(dashboardAdminRequest, { statusCode: 200 }, toolKitMock);
+
+        expect(checkoutSpy).toBeCalledTimes(0);
+      });
+    });
   });
 
   describe('#setUpRedirectPage', () => {
diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
index 42ca77e922e4..6c82097fda3d 100644
--- a/src/plugins/workspace/server/plugin.ts
+++ b/src/plugins/workspace/server/plugin.ts
@@ -25,6 +25,7 @@ import {
   WORKSPACE_INITIAL_APP_ID,
   WORKSPACE_NAVIGATION_APP_ID,
   DEFAULT_WORKSPACE,
+  PRIORITY_FOR_REPOSITORY_WRAPPER,
 } from '../common/constants';
 import { IWorkspaceClientImpl, WorkspacePluginSetup, WorkspacePluginStart } from './types';
 import { WorkspaceClient } from './workspace_client';
@@ -32,8 +33,13 @@ import { registerRoutes } from './routes';
 import { WorkspaceSavedObjectsClientWrapper } from './saved_objects';
 import {
   cleanWorkspaceId,
+  cleanUpACLAuditor,
+  cleanUpClientCallAuditor,
+  getACLAuditor,
   getWorkspaceIdFromUrl,
   getWorkspaceState,
+  initializeACLAuditor,
+  initializeClientCallAuditor,
   updateWorkspaceState,
 } from '../../../core/server/utils';
 import { WorkspaceConflictSavedObjectsClientWrapper } from './saved_objects/saved_objects_wrapper_for_check_workspace_conflict';
@@ -45,6 +51,7 @@ import { getOSDAdminConfigFromYMLConfig, updateDashboardAdminStateForRequest } f
 import { WorkspaceIdConsumerWrapper } from './saved_objects/workspace_id_consumer_wrapper';
 import { WorkspaceUiSettingsClientWrapper } from './saved_objects/workspace_ui_settings_client_wrapper';
 import { uiSettings } from './ui_settings';
+import { RepositoryWrapper } from './saved_objects/repository_wrapper';
 
 export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePluginStart> {
   private readonly logger: Logger;
@@ -106,10 +113,36 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
       this.workspaceSavedObjectsClientWrapper.wrapperFactory
     );
 
+    core.savedObjects.addClientWrapper(
+      PRIORITY_FOR_REPOSITORY_WRAPPER,
+      // Give a symbol here so this wrapper won't be bypassed
+      Symbol('repository_wrapper').toString(),
+      new RepositoryWrapper().wrapperFactory
+    );
+
     core.http.registerOnPreResponse((request, _response, toolkit) => {
       this.permissionControl?.clearSavedObjectsCache(request);
       return toolkit.next();
     });
+
+    // Initialize ACL auditor in request.
+    core.http.registerOnPostAuth((request, response, toolkit) => {
+      initializeACLAuditor(request, this.logger);
+      initializeClientCallAuditor(request);
+      return toolkit.next();
+    });
+
+    // Clean up auditor before response.
+    core.http.registerOnPreResponse((request, response, toolkit) => {
+      const { isDashboardAdmin } = getWorkspaceState(request);
+      if (!isDashboardAdmin) {
+        // Only checkout auditor when current login user is not dashboard admin
+        getACLAuditor(request)?.checkout();
+      }
+      cleanUpACLAuditor(request);
+      cleanUpClientCallAuditor(request);
+      return toolkit.next();
+    });
   }
 
   private setUpRedirectPage(core: CoreSetup) {
@@ -117,7 +150,7 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
       const path = request.url.pathname;
       if (path === '/') {
         const workspaceListResponse = await this.client?.list(
-          { request, logger: this.logger },
+          { request },
           { page: 1, perPage: 100 }
         );
         const basePath = core.http.basePath.serverBasePath;
diff --git a/src/plugins/workspace/server/routes/index.ts b/src/plugins/workspace/server/routes/index.ts
index 599bc1e82f59..8a599812f0dc 100644
--- a/src/plugins/workspace/server/routes/index.ts
+++ b/src/plugins/workspace/server/routes/index.ts
@@ -283,6 +283,58 @@ export function registerRoutes({
     })
   );
 
+  router.post(
+    {
+      path: `${WORKSPACES_API_BASE_URL}/_associate`,
+      validate: {
+        body: schema.object({
+          workspaceId: schema.string(),
+          savedObjects: schema.arrayOf(
+            schema.object({ id: schema.string(), type: schema.string() })
+          ),
+        }),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const { workspaceId, savedObjects } = req.body;
+
+      const result = await client.associate(
+        {
+          request: req,
+        },
+        workspaceId,
+        savedObjects
+      );
+      return res.ok({ body: result });
+    })
+  );
+
+  router.post(
+    {
+      path: `${WORKSPACES_API_BASE_URL}/_dissociate`,
+      validate: {
+        body: schema.object({
+          workspaceId: schema.string(),
+          savedObjects: schema.arrayOf(
+            schema.object({ id: schema.string(), type: schema.string() })
+          ),
+        }),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const { workspaceId, savedObjects } = req.body;
+
+      const result = await client.dissociate(
+        {
+          request: req,
+        },
+        workspaceId,
+        savedObjects
+      );
+      return res.ok({ body: result });
+    })
+  );
+
   // duplicate saved objects among workspaces
   registerDuplicateRoute(router, logger, client, maxImportExportSize);
 }
diff --git a/src/plugins/workspace/server/saved_objects/repository_wrapper.test.ts b/src/plugins/workspace/server/saved_objects/repository_wrapper.test.ts
new file mode 100644
index 000000000000..63ad0b0dfb77
--- /dev/null
+++ b/src/plugins/workspace/server/saved_objects/repository_wrapper.test.ts
@@ -0,0 +1,146 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { httpServerMock, savedObjectsClientMock, coreMock } from '../../../../core/server/mocks';
+import { RepositoryWrapper } from './repository_wrapper';
+import {
+  ACLAuditorStateKey,
+  getACLAuditor,
+  initializeACLAuditor,
+} from '../../../../core/server/utils';
+import { loggerMock } from '@osd/logging/target/mocks';
+
+describe('RepositoryWrapper', () => {
+  const getMockedObjects = () => {
+    const requestHandlerContext = coreMock.createRequestHandlerContext();
+    const wrapperInstance = new RepositoryWrapper();
+    const mockedClient = savedObjectsClientMock.create();
+    const mockedRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const mockedLogger = loggerMock.create();
+    initializeACLAuditor(mockedRequest, mockedLogger);
+    const wrapperClient = wrapperInstance.wrapperFactory({
+      client: mockedClient,
+      typeRegistry: requestHandlerContext.savedObjects.typeRegistry,
+      request: mockedRequest,
+    });
+    return {
+      client: wrapperClient,
+      request: mockedRequest,
+      ACLAuditorInstance: getACLAuditor(mockedRequest),
+    };
+  };
+  describe('create', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.create('dashboard', {
+        name: 'foo',
+      });
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+
+  describe('bulkCreate', () => {
+    it('should increment objects.length in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.bulkCreate([
+        {
+          type: 'foo',
+          id: 'foo',
+          attributes: {},
+        },
+        {
+          type: 'bar',
+          id: 'bar',
+          attributes: {},
+        },
+      ]);
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(2);
+    });
+  });
+
+  describe('get', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.get('foo', 'bar');
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+
+  describe('bulkGet', () => {
+    it('should increment objects.length in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.bulkGet([
+        {
+          type: 'foo',
+          id: 'foo',
+        },
+        {
+          type: 'bar',
+          id: 'bar',
+        },
+      ]);
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(2);
+    });
+  });
+
+  describe('delete', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.delete('foo', 'bar');
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+
+  describe('update', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.update('foo', 'bar', {});
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+
+  describe('bulkUpdate', () => {
+    it('should increment objects.length in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.bulkUpdate([
+        {
+          type: 'foo',
+          id: 'foo',
+          attributes: {},
+        },
+        {
+          type: 'bar',
+          id: 'bar',
+          attributes: {},
+        },
+      ]);
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(2);
+    });
+  });
+
+  describe('deleteByWorkspace', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.deleteByWorkspace('foo');
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+
+  describe('addToWorkspaces', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.addToWorkspaces('foo', 'bar', ['foo']);
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+
+  describe('deleteFromWorkspaces', () => {
+    it('should increment 1 in ACLAuditor', async () => {
+      const { ACLAuditorInstance, client } = getMockedObjects();
+      await client.deleteFromWorkspaces('foo', 'bar', ['foo']);
+      expect(ACLAuditorInstance?.getState()[ACLAuditorStateKey.DATABASE_OPERATION]).toEqual(1);
+    });
+  });
+});
diff --git a/src/plugins/workspace/server/saved_objects/repository_wrapper.ts b/src/plugins/workspace/server/saved_objects/repository_wrapper.ts
new file mode 100644
index 000000000000..fb86d19b8b7c
--- /dev/null
+++ b/src/plugins/workspace/server/saved_objects/repository_wrapper.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ACLAuditorStateKey, getACLAuditor } from '../../../../core/server/utils';
+import { SavedObjectsClientWrapperFactory } from '../../../../core/server';
+
+export class RepositoryWrapper {
+  public wrapperFactory: SavedObjectsClientWrapperFactory = (wrapperOptions) => {
+    const ACLAuditDecorator = function <T extends (...args: any[]) => any>(
+      fn: T,
+      getCount: (args: Parameters<T>) => number = () => 1
+    ): T {
+      return function (...args: Parameters<T>): ReturnType<T> {
+        const result = fn.apply(wrapperOptions.client, args);
+        const ACLAuditor = getACLAuditor(wrapperOptions.request);
+        ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, getCount(args));
+        return result;
+      } as T;
+    };
+
+    return {
+      ...wrapperOptions.client,
+      get: ACLAuditDecorator(wrapperOptions.client.get),
+      checkConflicts: wrapperOptions.client.checkConflicts,
+      find: wrapperOptions.client.find,
+      bulkGet: ACLAuditDecorator(wrapperOptions.client.bulkGet, (args) => args[0]?.length || 0),
+      errors: wrapperOptions.client.errors,
+      addToNamespaces: wrapperOptions.client.addToNamespaces,
+      deleteFromNamespaces: wrapperOptions.client.deleteFromNamespaces,
+      create: ACLAuditDecorator(wrapperOptions.client.create),
+      bulkCreate: ACLAuditDecorator(
+        wrapperOptions.client.bulkCreate,
+        (args) => args[0]?.length || 0
+      ),
+      delete: ACLAuditDecorator(wrapperOptions.client.delete),
+      update: ACLAuditDecorator(wrapperOptions.client.update),
+      bulkUpdate: ACLAuditDecorator(
+        wrapperOptions.client.bulkUpdate,
+        (args) => args[0]?.length || 0
+      ),
+      deleteByWorkspace: ACLAuditDecorator(wrapperOptions.client.deleteByWorkspace),
+      addToWorkspaces: ACLAuditDecorator(wrapperOptions.client.addToWorkspaces),
+      deleteFromWorkspaces: ACLAuditDecorator(wrapperOptions.client.deleteFromWorkspaces),
+    };
+  };
+
+  constructor() {}
+}
diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.test.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.test.ts
index 5fcb124f5323..e9f5c5c2a409 100644
--- a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.test.ts
+++ b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.test.ts
@@ -3,10 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getWorkspaceState, updateWorkspaceState } from '../../../../core/server/utils';
-import { SavedObjectsErrorHelpers } from '../../../../core/server';
+import { loggerMock } from '@osd/logging/target/mocks';
+import {
+  getACLAuditor,
+  getWorkspaceState,
+  initializeACLAuditor,
+  initializeClientCallAuditor,
+  updateWorkspaceState,
+} from '../../../../core/server/utils';
+import {
+  SavedObject,
+  SavedObjectsBulkGetObject,
+  SavedObjectsClientWrapperOptions,
+  SavedObjectsErrorHelpers,
+} from '../../../../core/server';
 import { WorkspaceSavedObjectsClientWrapper } from './workspace_saved_objects_client_wrapper';
-import { httpServerMock } from '../../../../core/server/mocks';
+import { httpServerMock, savedObjectsClientMock, coreMock } from '../../../../core/server/mocks';
 import {
   DATA_SOURCE_SAVED_OBJECT_TYPE,
   DATA_CONNECTION_SAVED_OBJECT_TYPE,
@@ -17,7 +29,7 @@ const NO_DASHBOARD_ADMIN = 'no_dashboard_admin';
 const DATASOURCE_ADMIN = 'dataSource_admin';
 
 const generateWorkspaceSavedObjectsClientWrapper = (role = NO_DASHBOARD_ADMIN) => {
-  const savedObjectsStore = [
+  const savedObjectsStore: SavedObject[] = [
     {
       type: 'dashboard',
       id: 'foo',
@@ -26,6 +38,7 @@ const generateWorkspaceSavedObjectsClientWrapper = (role = NO_DASHBOARD_ADMIN) =
         bar: 'baz',
       },
       permissions: {},
+      references: [],
     },
     {
       type: 'dashboard',
@@ -35,6 +48,7 @@ const generateWorkspaceSavedObjectsClientWrapper = (role = NO_DASHBOARD_ADMIN) =
         bar: 'baz',
       },
       permissions: {},
+      references: [],
     },
     {
       type: 'dashboard',
@@ -44,106 +58,129 @@ const generateWorkspaceSavedObjectsClientWrapper = (role = NO_DASHBOARD_ADMIN) =
         bar: 'baz',
       },
       permissions: {},
+      references: [],
     },
-    { type: 'workspace', id: 'workspace-1', attributes: { name: 'Workspace - 1' } },
+    { type: 'workspace', id: 'workspace-1', attributes: { name: 'Workspace - 1' }, references: [] },
     {
       type: 'workspace',
       id: 'not-permitted-workspace',
       attributes: { name: 'Not permitted workspace' },
+      references: [],
     },
     {
       type: DATA_SOURCE_SAVED_OBJECT_TYPE,
       id: 'global-data-source',
       attributes: { title: 'Global data source' },
+      references: [],
     },
     {
       type: DATA_CONNECTION_SAVED_OBJECT_TYPE,
       id: 'global-data-connection',
       attributes: { title: 'Global data connection' },
+      references: [],
     },
     {
       type: DATA_SOURCE_SAVED_OBJECT_TYPE,
       id: 'global-data-source-empty-workspaces',
       attributes: { title: 'Global data source empty workspaces' },
       workspaces: [],
+      references: [],
     },
     {
       type: DATA_CONNECTION_SAVED_OBJECT_TYPE,
       id: 'global-data-connection-empty-workspaces',
       attributes: { title: 'Global data connection empty workspaces' },
       workspaces: [],
+      references: [],
     },
     {
       type: DATA_SOURCE_SAVED_OBJECT_TYPE,
       id: 'workspace-1-data-source',
       attributes: { title: 'Workspace 1 data source' },
       workspaces: ['workspace-1'],
+      references: [],
     },
     {
       type: DATA_CONNECTION_SAVED_OBJECT_TYPE,
       id: 'workspace-1-data-connection',
       attributes: { title: 'Workspace 1 data connection' },
       workspaces: ['workspace-1'],
+      references: [],
     },
     {
       type: DATA_SOURCE_SAVED_OBJECT_TYPE,
       id: 'workspace-2-data-source',
       attributes: { title: 'Workspace 2 data source' },
       workspaces: ['mock-request-workspace-id'],
+      references: [],
     },
     {
       type: DATA_CONNECTION_SAVED_OBJECT_TYPE,
       id: 'workspace-2-data-connection',
       attributes: { title: 'Workspace 2 data connection' },
       workspaces: ['mock-request-workspace-id'],
+      references: [],
+    },
+    {
+      type: 'workspace',
+      id: 'foo',
+      references: [],
+      attributes: {},
     },
   ];
-  const clientMock = {
-    get: jest.fn().mockImplementation(async (type, id) => {
-      if (type === 'config') {
-        return {
-          type: 'config',
-        };
-      }
-      if (id === 'unknown-error-dashboard') {
-        throw new Error('Unknown error');
-      }
-      return (
-        savedObjectsStore.find((item) => item.type === type && item.id === id) ||
-        SavedObjectsErrorHelpers.createGenericNotFoundError()
-      );
-    }),
-    create: jest.fn(),
-    bulkCreate: jest.fn(),
-    checkConflicts: jest.fn(),
-    delete: jest.fn(),
-    update: jest.fn(),
-    bulkUpdate: jest.fn(),
-    bulkGet: jest.fn().mockImplementation((savedObjectsToFind) => {
+  const clientMock = savedObjectsClientMock.create();
+  clientMock.get.mockImplementation(async (type, id) => {
+    if (type === 'config') {
+      return {
+        type: 'config',
+        id,
+        attributes: {},
+        references: [],
+      };
+    }
+    if (id === 'unknown-error-dashboard') {
+      throw new Error('Unknown error');
+    }
+
+    const findItem = savedObjectsStore.find((item) => item.type === type && item.id === id);
+    if (findItem) {
+      return findItem;
+    }
+
+    throw SavedObjectsErrorHelpers.createGenericNotFoundError();
+  });
+  clientMock.bulkGet.mockImplementation(
+    async (savedObjectsToFind: SavedObjectsBulkGetObject[] | undefined) => {
       return {
         saved_objects: savedObjectsStore.filter((item) =>
-          savedObjectsToFind.find(
+          savedObjectsToFind?.find(
             (itemToFind) => itemToFind.type === item.type && itemToFind.id === item.id
           )
         ),
       };
-    }),
-    find: jest.fn().mockImplementation(({ type, workspaces }) => {
-      const savedObjects = savedObjectsStore.filter(
+    }
+  );
+  clientMock.find.mockImplementation(async ({ type, workspaces }) => {
+    const savedObjects = savedObjectsStore
+      .filter(
         (item) =>
           item.type === type &&
           (!workspaces || item.workspaces?.some((workspaceId) => workspaces.includes(workspaceId)))
-      );
-      return {
-        saved_objects: savedObjects,
-        total: savedObjects.length,
-      };
-    }),
-    deleteByWorkspace: jest.fn(),
-    addToWorkspaces: jest.fn(),
-    deleteFromWorkspaces: jest.fn(),
-  };
+      )
+      .map((item) => ({
+        ...item,
+        score: 1,
+      }));
+    return {
+      per_page: 10,
+      page: 1,
+      saved_objects: savedObjects,
+      total: savedObjects.length,
+    };
+  });
   const requestMock = httpServerMock.createOpenSearchDashboardsRequest();
+  initializeACLAuditor(requestMock, loggerMock.create());
+  initializeClientCallAuditor(requestMock);
   updateWorkspaceState(requestMock, { requestWorkspaceId: 'mock-request-workspace-id' });
   if (role === DASHBOARD_ADMIN) {
     updateWorkspaceState(requestMock, { isDashboardAdmin: true });
@@ -152,10 +189,12 @@ const generateWorkspaceSavedObjectsClientWrapper = (role = NO_DASHBOARD_ADMIN) =
     updateWorkspaceState(requestMock, { isDataSourceAdmin: true });
   }
 
-  const wrapperOptions = {
+  const coreHandleMock = coreMock.createStart();
+
+  const wrapperOptions: SavedObjectsClientWrapperOptions = {
     client: clientMock,
     request: requestMock,
-    typeRegistry: {},
+    typeRegistry: coreHandleMock.savedObjects.getTypeRegistry(),
   };
   const permissionControlMock = {
     setup: jest.fn(),
@@ -171,14 +210,19 @@ const generateWorkspaceSavedObjectsClientWrapper = (role = NO_DASHBOARD_ADMIN) =
       return { users: ['user-1'] };
     }),
     addToCacheAllowlist: jest.fn(),
+    clearSavedObjectsCache: jest.fn(),
   };
 
   const wrapper = new WorkspaceSavedObjectsClientWrapper(permissionControlMock);
-  const scopedClientMock = {
-    find: jest.fn().mockImplementation(async () => ({
-      saved_objects: [{ id: 'workspace-1', type: 'workspace' }],
-    })),
-  };
+  const scopedClientMock = savedObjectsClientMock.create();
+  scopedClientMock.find.mockImplementation(async () => ({
+    total: 1,
+    per_page: 1,
+    page: 1,
+    saved_objects: [
+      { id: 'workspace-1', type: 'workspace', score: 1, attributes: {}, references: [] },
+    ],
+  }));
   wrapper.setScopedClient(() => scopedClientMock);
   return {
     wrapper: wrapper.wrapperFactory(wrapperOptions),
@@ -377,11 +421,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
         expect(errorCatched?.message).toEqual('Invalid workspace permission');
       });
       it('should throw error if unable to get object when override', async () => {
-        const {
-          wrapper,
-          permissionControlMock,
-          requestMock,
-        } = generateWorkspaceSavedObjectsClientWrapper();
+        const { wrapper, permissionControlMock } = generateWorkspaceSavedObjectsClientWrapper();
         permissionControlMock.validate.mockResolvedValueOnce({ success: true, result: false });
         let errorCatched;
         try {
@@ -550,7 +590,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
       it('should return saved object if no need to validate permission', async () => {
         const { wrapper, permissionControlMock } = generateWorkspaceSavedObjectsClientWrapper();
         const result = await wrapper.get('config', 'config-1');
-        expect(result).toEqual({ type: 'config' });
+        expect(result).toEqual(expect.objectContaining({ type: 'config' }));
         expect(permissionControlMock.validate).not.toHaveBeenCalled();
       });
       it("should call permission validate with object's workspace and throw permission error", async () => {
@@ -577,11 +617,10 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
       });
       it('should call permission validateSavedObjectsACL with object', async () => {
         const { wrapper, permissionControlMock } = generateWorkspaceSavedObjectsClientWrapper();
-        let errorCatched;
         try {
           await wrapper.get('dashboard', 'not-permitted-dashboard');
         } catch (e) {
-          errorCatched = e;
+          // Add 1 line to pass no-empty lint check
         }
         expect(permissionControlMock.validateSavedObjectsACL).toHaveBeenCalledWith(
           [
@@ -604,7 +643,14 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
         const getArgs = ['workspace', 'foo', {}] as const;
         const result = await wrapper.get(...getArgs);
         expect(clientMock.get).toHaveBeenCalledWith(...getArgs);
-        expect(result).toMatchInlineSnapshot(`[Error: Not Found]`);
+        expect(result).toMatchInlineSnapshot(`
+          Object {
+            "attributes": Object {},
+            "id": "foo",
+            "references": Array [],
+            "type": "workspace",
+          }
+        `);
       });
 
       it('should validate data source or data connection workspace field', async () => {
@@ -629,23 +675,27 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
         );
 
         let result = await wrapper.get('data-source', 'workspace-2-data-source');
-        expect(result).toEqual({
-          attributes: {
-            title: 'Workspace 2 data source',
-          },
-          id: 'workspace-2-data-source',
-          type: 'data-source',
-          workspaces: ['mock-request-workspace-id'],
-        });
+        expect(result).toEqual(
+          expect.objectContaining({
+            attributes: {
+              title: 'Workspace 2 data source',
+            },
+            id: 'workspace-2-data-source',
+            type: 'data-source',
+            workspaces: ['mock-request-workspace-id'],
+          })
+        );
         result = await wrapper.get('data-connection', 'workspace-2-data-connection');
-        expect(result).toEqual({
-          attributes: {
-            title: 'Workspace 2 data connection',
-          },
-          id: 'workspace-2-data-connection',
-          type: 'data-connection',
-          workspaces: ['mock-request-workspace-id'],
-        });
+        expect(result).toEqual(
+          expect.objectContaining({
+            attributes: {
+              title: 'Workspace 2 data connection',
+            },
+            id: 'workspace-2-data-connection',
+            type: 'data-connection',
+            workspaces: ['mock-request-workspace-id'],
+          })
+        );
       });
 
       it('should not validate data source or data connection when not in workspace', async () => {
@@ -657,6 +707,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
           id: 'workspace-1-data-source',
           attributes: { title: 'Workspace 1 data source' },
           workspaces: ['workspace-1'],
+          references: [],
         });
         result = await wrapper.get('data-connection', 'workspace-1-data-connection');
         expect(result).toEqual({
@@ -664,6 +715,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
           id: 'workspace-1-data-connection',
           attributes: { title: 'Workspace 1 data connection' },
           workspaces: ['workspace-1'],
+          references: [],
         });
       });
 
@@ -675,6 +727,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
           id: 'workspace-1-data-source',
           attributes: { title: 'Workspace 1 data source' },
           workspaces: ['workspace-1'],
+          references: [],
         });
       });
 
@@ -746,11 +799,10 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
       });
       it('should call permission validateSavedObjectsACL with object', async () => {
         const { wrapper, permissionControlMock } = generateWorkspaceSavedObjectsClientWrapper();
-        let errorCatched;
         try {
           await wrapper.bulkGet([{ type: 'dashboard', id: 'not-permitted-dashboard' }]);
         } catch (e) {
-          errorCatched = e;
+          // Add 1 line to pass no-empty lint check
         }
         expect(permissionControlMock.validateSavedObjectsACL).toHaveBeenCalledWith(
           [
@@ -831,6 +883,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
               id: 'workspace-2-data-source',
               type: 'data-source',
               workspaces: ['mock-request-workspace-id'],
+              references: [],
             },
           ],
         });
@@ -850,6 +903,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
               id: 'workspace-2-data-connection',
               type: 'data-connection',
               workspaces: ['mock-request-workspace-id'],
+              references: [],
             },
           ],
         });
@@ -873,6 +927,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
               id: 'workspace-1-data-source',
               type: 'data-source',
               workspaces: ['workspace-1'],
+              references: [],
             },
           ],
         });
@@ -892,6 +947,7 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
               id: 'workspace-1-data-connection',
               type: 'data-connection',
               workspaces: ['workspace-1'],
+              references: [],
             },
           ],
         });
@@ -1010,9 +1066,14 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
         const { wrapper, clientMock } = generateWorkspaceSavedObjectsClientWrapper(
           DATASOURCE_ADMIN
         );
-        clientMock.find.mockImplementation(() => ({
+        clientMock.find.mockImplementation(async () => ({
+          total: 2,
+          per_page: 10,
+          page: 1,
           saved_objects: [
             {
+              score: 1,
+              references: [],
               id: 'global_config',
               type: 'config',
               attributes: {
@@ -1020,8 +1081,11 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
               },
             },
             {
+              score: 1,
+              references: [],
               id: 'user_config',
               type: 'config',
+              attributes: {},
             },
           ],
         }));
@@ -1286,4 +1350,22 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
       });
     });
   });
+
+  describe('ACLAuditor', () => {
+    it('should check out once after multiple parallel client calls all finished', async () => {
+      const { wrapper, requestMock } = generateWorkspaceSavedObjectsClientWrapper();
+      const auditor = getACLAuditor(requestMock);
+      let checkSpy;
+      if (auditor) {
+        checkSpy = jest.spyOn(auditor, 'checkout');
+      }
+
+      await Promise.all([
+        wrapper.get('workspace', 'foo'),
+        wrapper.get('workspace', 'foo'),
+        wrapper.get('workspace', 'foo'),
+      ]);
+      expect(checkSpy).toBeCalledTimes(1);
+    });
+  });
 });
diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
index 876f333be95e..162f7a488ad2 100644
--- a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
+++ b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
@@ -5,7 +5,13 @@
 
 import { i18n } from '@osd/i18n';
 
-import { getWorkspaceState } from '../../../../core/server/utils';
+import {
+  ACLAuditorStateKey,
+  CLIENT_CALL_AUDITOR_KEY,
+  getACLAuditor,
+  getClientCallAuditor,
+  getWorkspaceState,
+} from '../../../../core/server/utils';
 import {
   OpenSearchDashboardsRequest,
   SavedObject,
@@ -27,6 +33,7 @@ import {
   SavedObjectsServiceStart,
   SavedObjectsClientContract,
   SavedObjectsDeleteByWorkspaceOptions,
+  SavedObjectsFindResult,
 } from '../../../../core/server';
 import { SavedObjectsPermissionControlContract } from '../permission_control/client';
 import {
@@ -236,12 +243,16 @@ export class WorkspaceSavedObjectsClientWrapper {
   }
 
   public wrapperFactory: SavedObjectsClientWrapperFactory = (wrapperOptions) => {
+    const ACLAuditor = getACLAuditor(wrapperOptions.request);
+    const clientCallAuditor = getClientCallAuditor(wrapperOptions.request);
     const deleteWithWorkspacePermissionControl = async (
       type: string,
       id: string,
       options: SavedObjectsDeleteOptions = {}
     ) => {
       const objectToDeleted = await wrapperOptions.client.get(type, id, options);
+      // System request, -1 for compensation.
+      ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, -1);
       if (
         !(await this.validateWorkspacesAndSavedObjectsPermissions(
           objectToDeleted,
@@ -250,8 +261,10 @@ export class WorkspaceSavedObjectsClientWrapper {
           [WorkspacePermissionMode.Write]
         ))
       ) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
         throw generateSavedObjectsPermissionError();
       }
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       return await wrapperOptions.client.delete(type, id, options);
     };
 
@@ -279,10 +292,14 @@ export class WorkspaceSavedObjectsClientWrapper {
       options: SavedObjectsUpdateOptions = {}
     ): Promise<SavedObjectsUpdateResponse<T>> => {
       const objectToUpdate = await wrapperOptions.client.get<T>(type, id, options);
+      // System request, -1 for compensation.
+      ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, -1);
       const permitted = await validateUpdateWithWorkspacePermission(objectToUpdate);
       if (!permitted) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
         throw generateSavedObjectsPermissionError();
       }
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       return await wrapperOptions.client.update(type, id, attributes, options);
     };
 
@@ -291,6 +308,8 @@ export class WorkspaceSavedObjectsClientWrapper {
       options?: SavedObjectsBulkUpdateOptions
     ): Promise<SavedObjectsBulkUpdateResponse<T>> => {
       const objectsToUpdate = await wrapperOptions.client.bulkGet<T>(objects, options);
+      // System request, -1 * objects.length for compensation.
+      ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, -1 * objects.length);
       this.permissionControl.addToCacheAllowlist(
         wrapperOptions.request,
         getWorkspacesFromSavedObjects(objectsToUpdate.saved_objects)
@@ -299,10 +318,12 @@ export class WorkspaceSavedObjectsClientWrapper {
       for (const object of objectsToUpdate.saved_objects) {
         const permitted = await validateUpdateWithWorkspacePermission(object);
         if (!permitted) {
+          ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
           throw generateSavedObjectsPermissionError();
         }
       }
 
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, objects.length);
       return await wrapperOptions.client.bulkUpdate(objects, options);
     };
 
@@ -344,6 +365,8 @@ export class WorkspaceSavedObjectsClientWrapper {
             let rawObject;
             try {
               rawObject = await wrapperOptions.client.get(type, id);
+              // System request, -1 for compensation.
+              ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, -1);
             } catch (error) {
               // If object is not found, we will skip the validation of this object.
               if (SavedObjectsErrorHelpers.isNotFoundError(error as Error)) {
@@ -365,12 +388,15 @@ export class WorkspaceSavedObjectsClientWrapper {
                 false
               ))
             ) {
+              ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
               throw generateWorkspacePermissionError();
             }
           }
         }
       }
 
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, objects.length);
+
       return await wrapperOptions.client.bulkCreate(objects, options);
     };
 
@@ -396,6 +422,7 @@ export class WorkspaceSavedObjectsClientWrapper {
           [WorkspacePermissionMode.LibraryWrite]
         ))
       ) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, options.workspaces?.length ?? 0);
         throw generateWorkspacePermissionError();
       }
 
@@ -406,21 +433,25 @@ export class WorkspaceSavedObjectsClientWrapper {
        * it has permission to any of the workspaces that the object associates with.
        *
        */
-      if (
-        options?.overwrite &&
-        options.id &&
-        !hasTargetWorkspaces &&
-        !(await this.validateWorkspacesAndSavedObjectsPermissions(
-          await wrapperOptions.client.get(type, options.id),
-          wrapperOptions.request,
-          [WorkspacePermissionMode.LibraryWrite],
-          [WorkspacePermissionMode.Write],
-          false
-        ))
-      ) {
-        throw generateWorkspacePermissionError();
+      if (options?.overwrite && options.id && !hasTargetWorkspaces) {
+        const object = await wrapperOptions.client.get(type, options.id);
+        // System request, -1 for compensation.
+        ACLAuditor?.increment(ACLAuditorStateKey.DATABASE_OPERATION, -1);
+        if (
+          !(await this.validateWorkspacesAndSavedObjectsPermissions(
+            object,
+            wrapperOptions.request,
+            [WorkspacePermissionMode.LibraryWrite],
+            [WorkspacePermissionMode.Write],
+            false
+          ))
+        ) {
+          ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
+          throw generateWorkspacePermissionError();
+        }
       }
 
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       return await wrapperOptions.client.create(type, attributes, options);
     };
 
@@ -433,6 +464,7 @@ export class WorkspaceSavedObjectsClientWrapper {
 
       if (validateIsWorkspaceDataSourceAndConnectionObjectType(objectToGet.type)) {
         if (isDataSourceAdmin) {
+          ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
           return objectToGet;
         }
         const hasPermission = this.validateDataSourcePermissions(
@@ -440,6 +472,7 @@ export class WorkspaceSavedObjectsClientWrapper {
           wrapperOptions.request
         );
         if (!hasPermission) {
+          ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
           throw generateDataSourcePermissionError();
         }
       }
@@ -453,8 +486,10 @@ export class WorkspaceSavedObjectsClientWrapper {
           false
         ))
       ) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
         throw generateSavedObjectsPermissionError();
       }
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       return objectToGet;
     };
 
@@ -472,6 +507,7 @@ export class WorkspaceSavedObjectsClientWrapper {
         if (validateIsWorkspaceDataSourceAndConnectionObjectType(object.type)) {
           const hasPermission = this.validateDataSourcePermissions(object, wrapperOptions.request);
           if (!hasPermission) {
+            ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
             throw generateDataSourcePermissionError();
           }
         }
@@ -485,10 +521,14 @@ export class WorkspaceSavedObjectsClientWrapper {
             false
           ))
         ) {
+          ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
           throw generateSavedObjectsPermissionError();
         }
       }
-
+      ACLAuditor?.increment(
+        ACLAuditorStateKey.VALIDATE_SUCCESS,
+        objectToBulkGet.saved_objects.length
+      );
       return objectToBulkGet;
     };
 
@@ -540,7 +580,7 @@ export class WorkspaceSavedObjectsClientWrapper {
         return {
           ...findResult,
           total: finalSavedObjects.length,
-          saved_objects: finalSavedObjects,
+          saved_objects: finalSavedObjects as Array<SavedObjectsFindResult<T>>,
         };
       } else if (!options.workspaces && !options.ACLSearchParams) {
         options.workspaces = permittedWorkspaceIds;
@@ -577,9 +617,11 @@ export class WorkspaceSavedObjectsClientWrapper {
           WorkspacePermissionMode.LibraryWrite,
         ]))
       ) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
         throw generateWorkspacePermissionError();
       }
 
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       return await wrapperOptions.client.deleteByWorkspace(workspace, options);
     };
 
@@ -591,8 +633,10 @@ export class WorkspaceSavedObjectsClientWrapper {
     ) => {
       // Only dashboard admin can assign data source to workspace
       if (validateIsWorkspaceDataSourceAndConnectionObjectType(type)) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
         throw generateOSDAdminPermissionError();
       }
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       // In current version, only the type is data-source and data-connection that will call addToWorkspaces
       return await wrapperOptions.client.addToWorkspaces(type, id, targetWorkspaces, options);
     };
@@ -605,8 +649,10 @@ export class WorkspaceSavedObjectsClientWrapper {
     ) => {
       // Only dashboard admin can unassign data source and data-connection to workspace
       if (validateIsWorkspaceDataSourceAndConnectionObjectType(type)) {
+        ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
         throw generateOSDAdminPermissionError();
       }
+      ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_SUCCESS, 1);
       // In current version, only the type is data-source and data-connection will that call deleteFromWorkspaces
       return await wrapperOptions.client.deleteFromWorkspaces(type, id, targetWorkspaces, options);
     };
@@ -616,23 +662,65 @@ export class WorkspaceSavedObjectsClientWrapper {
       return wrapperOptions.client;
     }
 
+    const ACLAuditDecorator = function <T extends (...args: any[]) => any>(fn: T): T {
+      return function (...args: Parameters<T>): ReturnType<T> {
+        clientCallAuditor?.increment(CLIENT_CALL_AUDITOR_KEY.incoming);
+        const result = fn.apply(wrapperOptions.client, args);
+        if (result instanceof Promise) {
+          result.then(
+            () => {
+              clientCallAuditor?.increment(CLIENT_CALL_AUDITOR_KEY.outgoing);
+              try {
+                const checkoutInfo = JSON.stringify([fn.name, ...args]);
+                if (clientCallAuditor?.isAsyncClientCallsBalanced()) {
+                  ACLAuditor?.checkout(checkoutInfo);
+                }
+              } catch (e) {
+                if (clientCallAuditor?.isAsyncClientCallsBalanced()) {
+                  ACLAuditor?.checkout();
+                }
+              }
+            },
+            /**
+             * The catch here is required because unhandled promise will make server crashed,
+             * and we will reset the auditor state when catch an error.
+             */
+            () => {
+              clientCallAuditor?.increment(CLIENT_CALL_AUDITOR_KEY.outgoing);
+              if (clientCallAuditor?.isAsyncClientCallsBalanced()) {
+                ACLAuditor?.reset();
+              }
+            }
+          );
+        } else {
+          // The decorator is used to decorate async functions so the branch here won't be picked.
+          // But we still need to keep it in case there are sync calls in the future.
+          clientCallAuditor?.increment(CLIENT_CALL_AUDITOR_KEY.outgoing);
+          if (clientCallAuditor?.isAsyncClientCallsBalanced()) {
+            ACLAuditor?.checkout();
+          }
+        }
+        return result;
+      } as T;
+    };
+
     return {
       ...wrapperOptions.client,
-      get: getWithWorkspacePermissionControl,
+      get: ACLAuditDecorator(getWithWorkspacePermissionControl),
       checkConflicts: wrapperOptions.client.checkConflicts,
       find: findWithWorkspacePermissionControl,
-      bulkGet: bulkGetWithWorkspacePermissionControl,
+      bulkGet: ACLAuditDecorator(bulkGetWithWorkspacePermissionControl),
       errors: wrapperOptions.client.errors,
       addToNamespaces: wrapperOptions.client.addToNamespaces,
       deleteFromNamespaces: wrapperOptions.client.deleteFromNamespaces,
-      create: createWithWorkspacePermissionControl,
-      bulkCreate: bulkCreateWithWorkspacePermissionControl,
-      delete: deleteWithWorkspacePermissionControl,
-      update: updateWithWorkspacePermissionControl,
-      bulkUpdate: bulkUpdateWithWorkspacePermissionControl,
-      deleteByWorkspace: deleteByWorkspaceWithPermissionControl,
-      addToWorkspaces: addToWorkspacesWithPermissionControl,
-      deleteFromWorkspaces: deleteFromWorkspacesWithPermissionControl,
+      create: ACLAuditDecorator(createWithWorkspacePermissionControl),
+      bulkCreate: ACLAuditDecorator(bulkCreateWithWorkspacePermissionControl),
+      delete: ACLAuditDecorator(deleteWithWorkspacePermissionControl),
+      update: ACLAuditDecorator(updateWithWorkspacePermissionControl),
+      bulkUpdate: ACLAuditDecorator(bulkUpdateWithWorkspacePermissionControl),
+      deleteByWorkspace: ACLAuditDecorator(deleteByWorkspaceWithPermissionControl),
+      addToWorkspaces: ACLAuditDecorator(addToWorkspacesWithPermissionControl),
+      deleteFromWorkspaces: ACLAuditDecorator(deleteFromWorkspacesWithPermissionControl),
     };
   };
 
diff --git a/src/plugins/workspace/server/types.ts b/src/plugins/workspace/server/types.ts
index d9b998cc3344..8a268e655bdd 100644
--- a/src/plugins/workspace/server/types.ts
+++ b/src/plugins/workspace/server/types.ts
@@ -122,6 +122,46 @@ export interface IWorkspaceClientImpl {
    * @public
    */
   destroy(): Promise<IResponse<boolean>>;
+
+  /**
+   * Associates a list of objects with the given workspace ID.
+   *
+   * This method takes a workspace ID and an array of objects, where each object contains
+   * an `id` and `type`. It attempts to associate each object with the specified workspace.
+   * If the association succeeds, the object is included in the result without an error.
+   * If there is an issue associating an object, an error message is returned for that object.
+   *
+   * @returns A promise that resolves to a response object containing an array of results for each object.
+   *          Each result will include the object's `id` and, if there was an error during association, an `error` field
+   *          with the error message.
+   *
+   * @public
+   */
+  associate(
+    requestDetail: IRequestDetail,
+    workspaceId: string,
+    objects: Array<{ id: string; type: string }>
+  ): Promise<IResponse<Array<{ id: string; error?: string }>>>;
+
+  /**
+   * Dissociates a list of objects from the given workspace ID.
+   *
+   * This method takes a workspace ID and an array of objects, where each object contains
+   * an `id` and `type`. It attempts to dissociate each object from the specified workspace.
+   * If the dissociation succeeds, the object is included in the result without an error.
+   * If there is an issue dissociating an object, an error message is returned for that object.
+   *
+   * @returns A promise that resolves to a response object containing an array of results for each object.
+   *          Each result will include the object's `id` and, if there was an error during dissociation, an `error` field
+   *          with the error message.
+   *
+   * @public
+   */
+  dissociate(
+    requestDetail: IRequestDetail,
+    workspaceId: string,
+    objects: Array<{ id: string; type: string }>
+  ): Promise<IResponse<Array<{ id: string; error?: string }>>>;
 }
 
 export type IResponse<T> =
diff --git a/src/plugins/workspace/server/workspace_client.ts b/src/plugins/workspace/server/workspace_client.ts
index 2df7bc3dba38..d7d7ad890250 100644
--- a/src/plugins/workspace/server/workspace_client.ts
+++ b/src/plugins/workspace/server/workspace_client.ts
@@ -392,12 +392,67 @@ export class WorkspaceClient implements IWorkspaceClientImpl {
       };
     }
   }
+
+  public async associate(
+    requestDetail: IRequestDetail,
+    workspaceId: string,
+    objects: Array<{ id: string; type: string }>
+  ): Promise<IResponse<Array<{ id: string; error?: string }>>> {
+    const savedObjectClient = this.getSavedObjectClientsFromRequestDetail(requestDetail);
+    const promises = objects.map(async (obj) => {
+      try {
+        await savedObjectClient.addToWorkspaces(obj.type, obj.id, [workspaceId]);
+        return {
+          id: obj.id,
+        };
+      } catch (e) {
+        return {
+          id: obj.id,
+          error: this.formatError(e),
+        };
+      }
+    });
+    const result = await Promise.all(promises);
+    return {
+      success: true,
+      result,
+    };
+  }
+
+  public async dissociate(
+    requestDetail: IRequestDetail,
+    workspaceId: string,
+    objects: Array<{ id: string; type: string }>
+  ): Promise<IResponse<Array<{ id: string; error?: string }>>> {
+    const savedObjectClient = this.getSavedObjectClientsFromRequestDetail(requestDetail);
+    const promises = objects.map(async (obj) => {
+      try {
+        await savedObjectClient.deleteFromWorkspaces(obj.type, obj.id, [workspaceId]);
+        return {
+          id: obj.id,
+        };
+      } catch (e) {
+        return {
+          id: obj.id,
+          error: this.formatError(e),
+        };
+      }
+    });
+    const result = await Promise.all(promises);
+    return {
+      success: true,
+      result,
+    };
+  }
+
   public setSavedObjects(savedObjects: SavedObjectsServiceStart) {
     this.savedObjects = savedObjects;
   }
+
   public setUiSettings(uiSettings: UiSettingsServiceStart) {
     this.uiSettings = uiSettings;
   }
+
   public async destroy(): Promise<IResponse<boolean>> {
     return {
       success: true,
diff --git a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json
index 114143885ee3..aa131ed9577b 100644
--- a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.16.0",
     "@osd/plugin-helpers": "1.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.12.0",
diff --git a/test/plugin_functional/plugins/osd_sample_panel_action/package.json b/test/plugin_functional/plugins/osd_sample_panel_action/package.json
index e552a2e5e3f1..553af8c5ce69 100644
--- a/test/plugin_functional/plugins/osd_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/osd_sample_panel_action/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.16.0",
     "react": "^16.14.0",
     "typescript": "4.0.2"
   }
diff --git a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json
index a85769bad717..850f10c82349 100644
--- a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.16.0",
     "@osd/plugin-helpers": "1.0.0",
     "react": "^16.14.0",
     "typescript": "4.0.2"
diff --git a/yarn.lock b/yarn.lock
index c7d0bb98551c..e7361f69a2fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1431,10 +1431,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@npm:@opensearch-project/oui@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.15.0.tgz#bec1bcb15cee9bcc31c71920b1b491d0cb60a8d9"
-  integrity sha512-xa/ygOlmNnQy+LcSgsbr9WCL8jt6HzWoJcV4tI0uPo1j7GNTyi6IccE30CXjmUEqh3Fce82ghKzBuWGreJXGeQ==
+"@elastic/eui@npm:@opensearch-project/oui@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.16.0.tgz#349e06450a7357d1598f8ba12e929d41e18b2f91"
+  integrity sha512-Sc+2bukX2xmzysH+niqW7IUWPdOAdFbshn3fgXGgr9PLglV+ZwrtnkS0RFwbh2s10n8ENh1X/x5KyL71d/le3A==
   dependencies:
     "@types/chroma-js" "^2.4.0"
     "@types/react-beautiful-dnd" "^13.1.3"